diff --git a/pageant/Cargo.toml b/pageant/Cargo.toml index 2622b46..47e21c9 100644 --- a/pageant/Cargo.toml +++ b/pageant/Cargo.toml @@ -15,7 +15,7 @@ thiserror = { workspace = true } rand = { workspace = true } tokio = { workspace = true, features = ["io-util", "rt"] } bytes = "1.7" -delegate = "0.12" +delegate = "0.13" [target.'cfg(windows)'.dependencies] windows = { version = "0.58", features = [ diff --git a/russh-keys/Cargo.toml b/russh-keys/Cargo.toml index 9e027af..bf32f5c 100644 --- a/russh-keys/Cargo.toml +++ b/russh-keys/Cargo.toml @@ -35,7 +35,7 @@ openssl = { workspace = true, optional = true } p256 = "0.13" p384 = "0.13" p521 = "0.13" -pbkdf2 = "0.11" +pbkdf2 = "0.12" pkcs1 = "0.7" pkcs5 = "0.7" pkcs8 = { version = "0.10", features = ["pkcs5", "encryption"] } @@ -80,7 +80,7 @@ home = "0.5" pageant = { version = "0.0.1-beta.3", path = "../pageant" } [dev-dependencies] -env_logger = "0.10" +env_logger = "0.11" tempdir = "0.3" tokio = { workspace = true, features = ["test-util", "macros", "process"] } diff --git a/russh-keys/src/format/pkcs8_legacy.rs b/russh-keys/src/format/pkcs8_legacy.rs index 5553cce..ad9dc7f 100644 --- a/russh-keys/src/format/pkcs8_legacy.rs +++ b/russh-keys/src/format/pkcs8_legacy.rs @@ -150,10 +150,10 @@ impl KeyDerivation { match *self { KeyDerivation::Pbkdf2 { ref salt, rounds } => { pbkdf2::pbkdf2::>(password, salt, rounds as u32, key) + .map_err(|_| Error::InvalidParameters) // pbkdf2_hmac(password, salt, rounds as usize, digest, key)? } } - Ok(()) } } fn asn1_read_pbes2( diff --git a/russh/Cargo.toml b/russh/Cargo.toml index 29b9069..7a02e75 100644 --- a/russh/Cargo.toml +++ b/russh/Cargo.toml @@ -58,7 +58,7 @@ tokio = { workspace = true, features = ["io-util", "sync", "time"] } [dev-dependencies] anyhow = "1.0" -env_logger = "0.10" +env_logger = "0.11" clap = { version = "3.2", features = ["derive"] } tokio = { version = "1.17.0", features = [ "io-std",