From 853583aeecb6bf0827fecc41f8783c2c64ec7cb6 Mon Sep 17 00:00:00 2001 From: tottoto Date: Thu, 6 Nov 2025 22:51:05 +0900 Subject: [PATCH] Update to pbkdf2 0.12 --- Cargo.lock | 15 +++------------ Cargo.toml | 2 +- src/client/auth/scram.rs | 2 +- 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index fa2de72ea..c44332175 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1989,7 +1989,7 @@ dependencies = [ "openssl-probe", "opentelemetry", "opentelemetry_sdk", - "pbkdf2 0.11.0", + "pbkdf2", "pem", "percent-encoding", "pkcs8", @@ -2229,15 +2229,6 @@ dependencies = [ "windows-link 0.2.1", ] -[[package]] -name = "pbkdf2" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917" -dependencies = [ - "digest", -] - [[package]] name = "pbkdf2" version = "0.12.2" @@ -2306,7 +2297,7 @@ dependencies = [ "cbc", "der", "des", - "pbkdf2 0.12.2", + "pbkdf2", "scrypt", "sha1", "sha2", @@ -2774,7 +2765,7 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f" dependencies = [ - "pbkdf2 0.12.2", + "pbkdf2", "salsa20", "sha2", ] diff --git a/Cargo.toml b/Cargo.toml index 564db1254..54b1088c9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -177,7 +177,7 @@ default-features = false optional = true [dependencies.pbkdf2] -version = "0.11.0" +version = "0.12.0" default-features = false [dependencies.reqwest] diff --git a/src/client/auth/scram.rs b/src/client/auth/scram.rs index 597e36d15..88974621d 100644 --- a/src/client/auth/scram.rs +++ b/src/client/auth/scram.rs @@ -382,7 +382,7 @@ fn h_i( output_size: usize, ) -> Vec { let mut buf = vec![0u8; output_size]; - pbkdf2::pbkdf2::(str.as_bytes(), salt, iterations, buf.as_mut_slice()); + pbkdf2::pbkdf2::(str.as_bytes(), salt, iterations, buf.as_mut_slice()).unwrap(); buf }