Skip to content

fix(deps): migrate to stable pkcs5 / pkcs8 / ed25519 and loosen prerelease pins (extends #697) #702

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Eugeny merged 4 commits into from
May 16, 2026
Merged

fix(deps): migrate to stable pkcs5 / pkcs8 / ed25519 and loosen prerelease pins (extends #697) #702

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5cac2ed
fix(deps): migrate to stable pkcs5 / pkcs8 / ed25519 and loosen prere…
simon-escapecode May 8, 2026
40c6781
Merge remote-tracking branch 'origin/main' into pr/702
Eugeny May 16, 2026
9118ed2
pin deps
Eugeny May 16, 2026
39e32a7
bump ml-kem too
Eugeny May 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions russh/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ cipher = "0.5.1" # only pinned due to a cargo-minimal-versions failure in 0.5.0
ctr = "0.9"
ctr_0_10 = { package = "ctr", version = "0.10.0" }
curve25519-dalek = "=5.0.0-pre.6"
crypto-bigint = { version = "=0.7.0-rc.28", features = ["alloc"] }
crypto-bigint = { version = "0.7.3", features = ["alloc"] }
data-encoding = "2.3"
delegate.workspace = true
digest.workspace = true
der = "0.8"
des = { version = "0.8.1", optional = true }
ecdsa = "=0.17.0-rc.16"
ed25519-dalek = { version = "=3.0.0-pre.6", features = ["alloc", "rand_core", "pkcs8"] }
elliptic-curve = { version = "=0.14.0-rc.28", features = ["ecdh"] }
ecdsa = "0.17.0-rc.18"
ed25519-dalek = { version = "3.0.0-pre.7", features = ["alloc", "rand_core", "pkcs8"] }
Comment thread
Eugeny marked this conversation as resolved.
Outdated
elliptic-curve = { version = "0.14.0-rc.32", features = ["ecdh"] }
enum_dispatch = "0.3.13"
flate2 = { version = "1.0.15", optional = true }
futures.workspace = true
Expand All @@ -78,19 +78,19 @@ module-lattice = "0.2"
num-bigint = { package = "internal-russh-num-bigint", version = "=0.5.0", features = ["rand_0_10"] }
num_bigint_0_4 = { package = "num-bigint", version = "0.4.6" }
# num-integer = "0.1"
p256 = { version = "=0.14.0-rc.7", features = ["ecdh"] }
p384 = { version = "=0.14.0-rc.7", features = ["ecdh"] }
p521 = { version = "=0.14.0-rc.7", features = ["ecdh"] }
p256 = { version = "0.14.0-rc.9", features = ["ecdh"] }
p384 = { version = "0.14.0-rc.9", features = ["ecdh"] }
p521 = { version = "0.14.0-rc.9", features = ["ecdh"] }
pbkdf2 = "0.12"
pbkdf2_0_13 = { package = "pbkdf2", version = "0.13.0" }
pkcs1 = { version = "=0.8.0-rc.4", optional = true }
pkcs5 = "=0.8.0-rc.13"
pkcs8 = { version = "=0.11.0-rc.11", features = ["encryption", "std"] }
pkcs5 = "0.8"
pkcs8 = { version = "0.11", features = ["encryption", "std"] }
polyval = "0.7.1" # only pinned due to a cargo-minimal-versions failure in 0.7.0
rand_core = { version = "0.10.0" }
rand.workspace = true
ring = { version = "0.17.14", optional = true }
rsa = { version = "=0.10.0-rc.16", optional = true }
rsa = { version = "0.10.0-rc.18", optional = true }
russh-cryptovec = { version = "0.60.3", path = "../cryptovec", features = [
"ssh-encoding",
] }
Expand All @@ -104,7 +104,7 @@ sha2.workspace = true
sha2_0_11 = { package = "sha2", version = "0.11.0" }
sha3 = "0.11.0"
signature.workspace = true
spki = "=0.8.0-rc.4"
spki = "0.8"
ssh-encoding.workspace = true
ssh-key.workspace = true
subtle = "2.4"
Expand Down
2 changes: 1 addition & 1 deletion russh/src/keys/format/pkcs8.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ pub fn encode_pkcs8_encrypted(
rng.fill_bytes(&mut iv);

let doc = pvi.encrypt_with_params(
pkcs5::pbes2::Parameters::pbkdf2_sha256_aes256cbc(rounds, &salt, iv)
pkcs5::pbes2::Parameters::generate_pbkdf2_sha256_aes256cbc(rounds, &salt, iv)
.map_err(|_| Error::InvalidParameters)?,
pass,
)?;
Expand Down
Loading