Skip to content

Commit 63674d9

Browse files
fix(deps): migrate to stable pkcs5 / pkcs8 / ed25519 and loosen prerelease pins (extends #697) (#702)
Co-authored-by: Eugene <inbox@null.page>
1 parent a6202ae commit 63674d9

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

russh/Cargo.toml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ cipher = "0.5.1" # only pinned due to a cargo-minimal-versions failure in 0.5.0
4747
ctr = "0.9"
4848
ctr_0_10 = { package = "ctr", version = "0.10.0" }
4949
curve25519-dalek = "=5.0.0-pre.6"
50-
crypto-bigint = { version = "=0.7.0-rc.28", features = ["alloc"] }
50+
crypto-bigint = { version = "0.7.3", features = ["alloc"] }
5151
data-encoding = "2.3"
5252
delegate.workspace = true
5353
digest.workspace = true
5454
der = "0.8"
5555
des = { version = "0.8.1", optional = true }
56-
ecdsa = "=0.17.0-rc.16"
57-
ed25519-dalek = { version = "=3.0.0-pre.6", features = ["alloc", "rand_core", "pkcs8"] }
58-
elliptic-curve = { version = "=0.14.0-rc.28", features = ["ecdh"] }
56+
ecdsa = "=0.17.0-rc.18"
57+
ed25519-dalek = { version = "=3.0.0-pre.7", features = ["alloc", "rand_core", "pkcs8"] }
58+
elliptic-curve = { version = "=0.14.0-rc.32", features = ["ecdh"] }
5959
enum_dispatch = "0.3.13"
6060
flate2 = { version = "1.0.15", optional = true }
6161
futures.workspace = true
@@ -70,27 +70,27 @@ inout = { version = "0.1", features = ["std"] }
7070
keccak = "0.2.0"
7171
log.workspace = true
7272
md5 = "0.7"
73-
ml-kem = "=0.3.0-rc.1"
73+
ml-kem = "0.3"
7474
module-lattice = "0.2"
7575
# num-bigint 0.4.x only supports rand 0.8. PR #338 adds rand 0.10 support
7676
# via the `rand_0_10` feature flag. Replace with upstream once a release with
7777
# rand 0.10 support is published. https://github.com/rust-num/num-bigint/pull/338
7878
num-bigint = { package = "internal-russh-num-bigint", version = "=0.5.0", features = ["rand_0_10"] }
7979
num_bigint_0_4 = { package = "num-bigint", version = "0.4.6" }
8080
# num-integer = "0.1"
81-
p256 = { version = "=0.14.0-rc.7", features = ["ecdh"] }
82-
p384 = { version = "=0.14.0-rc.7", features = ["ecdh"] }
83-
p521 = { version = "=0.14.0-rc.7", features = ["ecdh"] }
81+
p256 = { version = "=0.14.0-rc.9", features = ["ecdh"] }
82+
p384 = { version = "=0.14.0-rc.9", features = ["ecdh"] }
83+
p521 = { version = "=0.14.0-rc.9", features = ["ecdh"] }
8484
pbkdf2 = "0.12"
8585
pbkdf2_0_13 = { package = "pbkdf2", version = "0.13.0" }
8686
pkcs1 = { version = "=0.8.0-rc.4", optional = true }
87-
pkcs5 = "=0.8.0-rc.13"
88-
pkcs8 = { version = "=0.11.0-rc.11", features = ["encryption", "std"] }
87+
pkcs5 = "0.8"
88+
pkcs8 = { version = "0.11", features = ["encryption", "std"] }
8989
polyval = "0.7.1" # only pinned due to a cargo-minimal-versions failure in 0.7.0
9090
rand_core = { version = "0.10.0" }
9191
rand.workspace = true
9292
ring = { version = "0.17.14", optional = true }
93-
rsa = { version = "=0.10.0-rc.16", optional = true }
93+
rsa = { version = "=0.10.0-rc.18", optional = true }
9494
russh-cryptovec = { version = "0.60.3", path = "../cryptovec", features = [
9595
"ssh-encoding",
9696
] }
@@ -104,7 +104,7 @@ sha2.workspace = true
104104
sha2_0_11 = { package = "sha2", version = "0.11.0" }
105105
sha3 = "0.11.0"
106106
signature.workspace = true
107-
spki = "=0.8.0-rc.4"
107+
spki = "0.8"
108108
ssh-encoding.workspace = true
109109
ssh-key.workspace = true
110110
subtle = "2.4"

russh/src/keys/format/pkcs8.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ pub fn encode_pkcs8_encrypted(
129129
rng.fill_bytes(&mut iv);
130130

131131
let doc = pvi.encrypt_with_params(
132-
pkcs5::pbes2::Parameters::pbkdf2_sha256_aes256cbc(rounds, &salt, iv)
132+
pkcs5::pbes2::Parameters::generate_pbkdf2_sha256_aes256cbc(rounds, &salt, iv)
133133
.map_err(|_| Error::InvalidParameters)?,
134134
pass,
135135
)?;

0 commit comments

Comments
 (0)