From d9231019a78c22c9c94e54674cf2ad636825e538 Mon Sep 17 00:00:00 2001
From: Eugene <inbox@null.page>
Date: Sat, 4 May 2024 20:49:19 +0200
Subject: [PATCH] extract common workspace deps

---
 Cargo.toml              | 16 +++++++++++++++-
 russh-config/Cargo.toml |  8 ++++----
 russh-keys/Cargo.toml   | 37 +++++++++++++++++++++----------------
 russh/Cargo.toml        | 36 ++++++++++++++++++------------------
 4 files changed, 58 insertions(+), 39 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 93e9216e..e0d28278 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = [ "russh-keys", "russh", "russh-config", "cryptovec"]
+members = ["russh-keys", "russh", "russh-config", "cryptovec"]
 
 [patch.crates-io]
 russh = { path = "russh" }
@@ -8,4 +8,18 @@ russh-cryptovec = { path = "cryptovec" }
 russh-config = { path = "russh-config" }
 
 [workspace.dependencies]
+aes = "0.8"
+async-trait = "0.1"
+byteorder = "1.4"
+digest = "0.10"
+futures = "0.3"
+hmac = "0.12"
+log = "0.4"
+openssl = { version = "0.10" }
+rand = "0.8"
+sha1 = { version = "0.10", features = ["oid"] }
+sha2 = { version = "0.10", features = ["oid"] }
+ssh-encoding = "0.2"
 ssh-key = { version = "0.6", features = ["ed25519", "rsa", "encryption"] }
+thiserror = "1.0"
+tokio = { version = "1.17.0" }
diff --git a/russh-config/Cargo.toml b/russh-config/Cargo.toml
index 1aefd62b..1e99ddf2 100644
--- a/russh-config/Cargo.toml
+++ b/russh-config/Cargo.toml
@@ -12,8 +12,8 @@ rust-version = "1.65"
 
 [dependencies]
 dirs-next = "2.0"
-futures = "0.3"
-log = "0.4"
-thiserror = "1.0"
-tokio = {version = "1.0", features = ["io-util", "net", "macros", "process"]}
+futures = { workspace = true }
+log = { workspace = true }
+thiserror = { workspace = true }
+tokio = { workspace = true, features = ["io-util", "net", "macros", "process"] }
 whoami = "1.2"
diff --git a/russh-keys/Cargo.toml b/russh-keys/Cargo.toml
index 6fbc21df..b0f3b672 100644
--- a/russh-keys/Cargo.toml
+++ b/russh-keys/Cargo.toml
@@ -30,27 +30,27 @@ version = "0.43.0"
 rust-version = "1.65"
 
 [dependencies]
-aes = "0.8"
-async-trait = "0.1.72"
+aes = { workspace = true }
+async-trait = { workspace = true }
 bcrypt-pbkdf = "0.10"
 cbc = "0.1"
 ctr = "0.9"
 block-padding = { version = "0.3", features = ["std"] }
-byteorder = "1.4"
+byteorder = { workspace = true }
 data-encoding = "2.3"
-digest = "0.10"
+digest = { workspace = true }
 der = "0.7"
 dirs = "5.0"
 ecdsa = "0.16"
-ed25519-dalek = { version= "2.0", features = ["rand_core", "pkcs8"] }
+ed25519-dalek = { version = "2.0", features = ["rand_core", "pkcs8"] }
 elliptic-curve = "0.13"
-futures = "0.3"
-hmac = "0.12"
+futures = { workspace = true }
+hmac = { workspace = true }
 inout = { version = "0.1", features = ["std"] }
-log = "0.4"
+log = { workspace = true }
 md5 = "0.7"
 num-integer = "0.1"
-openssl = { version = "0.10", optional = true }
+openssl = { workspace = true, optional = true }
 p256 = "0.13"
 p384 = "0.13"
 p521 = "0.13"
@@ -58,19 +58,24 @@ pbkdf2 = "0.11"
 pkcs1 = "0.7"
 pkcs5 = "0.7"
 pkcs8 = { version = "0.10", features = ["pkcs5", "encryption"] }
-rand = "0.8"
+rand = { workspace = true }
 rand_core = { version = "0.6.4", features = ["std"] }
 rsa = "0.9"
 russh-cryptovec = { version = "0.7.0", path = "../cryptovec" }
 sec1 = { version = "0.7", features = ["pkcs8"] }
 serde = { version = "1.0", features = ["derive"] }
-sha1 = { version = "0.10", features = ["oid"] }
-sha2 = { version = "0.10", features = ["oid"] }
+sha1 = { workspace = true }
+sha2 = { workspace = true }
 spki = "0.7"
-ssh-encoding = "0.2"
+ssh-encoding = { workspace = true }
 ssh-key = { workspace = true }
-thiserror = "1.0"
-tokio = { version = "1.17.0", features = ["io-util", "rt-multi-thread", "time", "net"] }
+thiserror = { workspace = true }
+tokio = { workspace = true, features = [
+  "io-util",
+  "rt-multi-thread",
+  "time",
+  "net",
+] }
 tokio-stream = { version = "0.1", features = ["net"] }
 typenum = "1.17"
 zeroize = "1.7"
@@ -81,7 +86,7 @@ vendored-openssl = ["openssl", "openssl/vendored"]
 [dev-dependencies]
 env_logger = "0.10"
 tempdir = "0.3"
-tokio = { version = "1.17.0", features = ["test-util", "macros", "process"] }
+tokio = { workspace = true, features = ["test-util", "macros", "process"] }
 
 [package.metadata.docs.rs]
 features = ["openssl"]
diff --git a/russh/Cargo.toml b/russh/Cargo.toml
index e6399d0e..8962b43f 100644
--- a/russh/Cargo.toml
+++ b/russh/Cargo.toml
@@ -18,35 +18,35 @@ openssl = ["russh-keys/openssl", "dep:openssl"]
 vendored-openssl = ["openssl/vendored", "russh-keys/vendored-openssl"]
 
 [dependencies]
-aes = "0.8"
+aes = { workspace = true }
 aes-gcm = "0.10"
-async-trait = "0.1"
+async-trait = { workspace = true }
 bitflags = "2.0"
-byteorder = "1.3"
+byteorder = { workspace = true }
 chacha20 = "0.9"
-curve25519-dalek = "4.1.2"
-poly1305 = "0.8"
 ctr = "0.9"
-digest = "0.10"
+curve25519-dalek = "4.1.2"
+digest = { workspace = true }
 flate2 = { version = "1.0", optional = true }
-futures = "0.3"
+futures = { workspace = true }
 generic-array = "0.14"
-hmac = "0.12"
-log = "0.4"
+hex-literal = "0.4"
+hmac = { workspace = true }
+log = { workspace = true }
+num-bigint = { version = "0.4", features = ["rand"] }
 once_cell = "1.13"
-openssl = { version = "0.10", optional = true }
-rand = "0.8"
+openssl = { workspace = true, optional = true }
+poly1305 = "0.8"
+rand = { workspace = true }
 russh-cryptovec = { version = "0.7.0", path = "../cryptovec" }
 russh-keys = { version = "0.43.0", path = "../russh-keys" }
-sha1 = "0.10"
-sha2 = "0.10"
-ssh-encoding = { version = "0.2.0" }
+sha1 = { workspace = true }
+sha2 = { workspace = true }
+ssh-encoding = { workspace = true }
 ssh-key = { workspace = true }
-hex-literal = "0.4"
-num-bigint = { version = "0.4", features = ["rand"] }
 subtle = "2.4"
-thiserror = "1.0"
-tokio = { version = "1.17.0", features = [
+thiserror = { workspace = true }
+tokio = { workspace = true, features = [
     "io-util",
     "rt-multi-thread",
     "time",