From 181154b47002041f35756390286a4cad404da966 Mon Sep 17 00:00:00 2001 From: Jemilu Mohammed Date: Thu, 30 Nov 2023 14:18:19 +0000 Subject: [PATCH] move external dependencies to workspace level --- Cargo.toml | 22 ++++++++++++++++++++++ ciphers/Cargo.toml | 6 +++--- fuzzing/Cargo.toml | 6 +++--- rosenpass/Cargo.toml | 32 ++++++++++++++++---------------- sodium/Cargo.toml | 6 +++--- to/Cargo.toml | 2 +- util/Cargo.toml | 4 ++-- 7 files changed, 50 insertions(+), 28 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index e46d599..9747f99 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,3 +14,25 @@ members = [ [workspace.metadata.release] # ensure that adding `--package` as argument to `cargo release` still creates version tags in the form of `vx.y.z` tag-prefix = "" + +[workspace.dependencies] +arbitrary = "1.3.2" +libfuzzer-sys = "0.4" +stacker = "0.1.15" +doc-comment = "0.3.3" +base64 = "0.21.1" +zeroize = "1.7.0" +memoffset = "0.9.0" +lazy_static = "1.4.0" +thiserror = "1.0.40" +paste = "1.0.12" +env_logger = "0.10.0" +serde = "1.0.163" +toml = "0.7.4" +mio = "0.8.6" +clap = "4.3.0" +static_assertions = "1.1.0" +log = { version = "0.4.17" } +anyhow = { version = "1.0.71" } +libsodium-sys-stable= { version = "1.19.28" } +oqs-sys = {default-features = false, version = "0.8" } \ No newline at end of file diff --git a/ciphers/Cargo.toml b/ciphers/Cargo.toml index c190957..f23cc60 100644 --- a/ciphers/Cargo.toml +++ b/ciphers/Cargo.toml @@ -10,9 +10,9 @@ repository = "https://github.com/rosenpass/rosenpass" readme = "readme.md" [dependencies] -anyhow = "1.0.75" +anyhow = { workspace = true } rosenpass-sodium = { path = "../sodium" } rosenpass-to = { path = "../to" } rosenpass-constant-time = { path = "../constant-time" } -static_assertions = "1.1.0" -zeroize = "1.7.0" +static_assertions = { workspace = true } +zeroize = { workspace = true } diff --git a/fuzzing/Cargo.toml b/fuzzing/Cargo.toml index f9d3e0e..c786de0 100644 --- a/fuzzing/Cargo.toml +++ b/fuzzing/Cargo.toml @@ -8,9 +8,9 @@ edition = "2021" cargo-fuzz = true [dependencies] -arbitrary = { version = "1.3.2", features = ["derive"]} -libfuzzer-sys = "0.4" -stacker = "0.1.15" +arbitrary = { workspace = true, features = ["derive"]} +libfuzzer-sys = { workspace = true } +stacker = { workspace = true } [dependencies.rosenpass] path = "../rosenpass" diff --git a/rosenpass/Cargo.toml b/rosenpass/Cargo.toml index 65d9c55..67195b9 100644 --- a/rosenpass/Cargo.toml +++ b/rosenpass/Cargo.toml @@ -19,25 +19,25 @@ rosenpass-constant-time = { path = "../constant-time" } rosenpass-sodium = { path = "../sodium" } rosenpass-ciphers = { path = "../ciphers" } rosenpass-to = { path = "../to" } -anyhow = { version = "1.0.71", features = ["backtrace"] } -static_assertions = "1.1.0" -memoffset = "0.9.0" -libsodium-sys-stable = { version = "1.19.28", features = ["use-pkg-config"] } -oqs-sys = { version = "0.8", default-features = false, features = ['classic_mceliece', 'kyber'] } -lazy_static = "1.4.0" -thiserror = "1.0.40" -paste = "1.0.12" -log = { version = "0.4.17" } -env_logger = { version = "0.10.0" } -serde = { version = "1.0.163", features = ["derive"] } -toml = "0.7.4" -clap = { version = "4.3.0", features = ["derive"] } -mio = { version = "0.8.6", features = ["net", "os-poll"] } +anyhow = { workspace = true, features = ["backtrace"] } +static_assertions = { workspace = true } +memoffset = { workspace = true } +libsodium-sys-stable = { workspace = true, features = ["use-pkg-config"] } +oqs-sys = { workspace = true, default-features = false, features = ['classic_mceliece', 'kyber'] } +lazy_static = { workspace = true } +thiserror = { workspace = true } +paste = { workspace = true } +log = { workspace = true } +env_logger = { workspace = true } +serde = { workspace = true, features = ["derive"] } +toml = { workspace = true } +clap = { workspace = true, features = ["derive"] } +mio = { workspace = true, features = ["net", "os-poll"] } [build-dependencies] -anyhow = "1.0.71" +anyhow = { workspace = true } [dev-dependencies] criterion = "0.4.0" test_bin = "0.4.0" -stacker = "0.1.15" +stacker = { workspace = true } diff --git a/sodium/Cargo.toml b/sodium/Cargo.toml index 3108888..6d791e3 100644 --- a/sodium/Cargo.toml +++ b/sodium/Cargo.toml @@ -12,6 +12,6 @@ readme = "readme.md" [dependencies] rosenpass-util = { path = "../util" } rosenpass-to = { path = "../to" } -anyhow = { version = "1.0.71", features = ["backtrace"] } -libsodium-sys-stable = { version = "1.19.28", features = ["use-pkg-config"] } -log = { version = "0.4.17" } +anyhow = { workspace = true, features = ["backtrace"] } +libsodium-sys-stable = { workspace = true, features = ["use-pkg-config"] } +log = { workspace = true } diff --git a/to/Cargo.toml b/to/Cargo.toml index 09b49e6..bda13f3 100644 --- a/to/Cargo.toml +++ b/to/Cargo.toml @@ -10,4 +10,4 @@ repository = "https://github.com/rosenpass/rosenpass" readme = "readme.md" [dev-dependencies] -doc-comment = "0.3.3" +doc-comment = { workspace = true } diff --git a/util/Cargo.toml b/util/Cargo.toml index d5b7bfa..6435345 100644 --- a/util/Cargo.toml +++ b/util/Cargo.toml @@ -12,5 +12,5 @@ readme = "readme.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -base64 = "0.21.1" -anyhow = { version = "1.0.71", features = ["backtrace"] } +base64 = { workspace = true } +anyhow = { workspace = true, features = ["backtrace"] }