Bump dependencies to latest prereleases (#511)

Also fixes `hybrid-array` deprecations. Updates the following: - `blake2` v0.11.0-pre.4 - `blowfish` v0.10.0-pre.1 - `cipher` v0.5.0-pre.6 - `crypto-bigint` v0.6.0-rc.2 - `digest` v0.11.0-pre.9 - `hmac` v0.13.0-pre.4 - `hybrid-array` v0.2.0-rc.9 - `salsa20` v0.11.0-pre.1 - `sha1` v0.11.0-pre.4 - `sha2` v0.11.0-pre.4 - `streebog` v0.11.0-pre.4
RustCrypto · Jul 27, 2024 · 985914d · 985914d
1 parent b06febc
commit 985914d
Show file tree

Hide file tree

Showing 11 changed files with 64 additions and 65 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,11 +13,3 @@ exclude = ["benches"]
 
 [profile.dev]
 opt-level = 2
-
-[patch.crates-io]
-# https://github.com/RustCrypto/block-ciphers/pull/413
-blowfish = { git = "https://github.com/RustCrypto/block-ciphers.git" }
-
-# https://github.com/RustCrypto/stream-ciphers/pull/345
-# https://github.com/RustCrypto/stream-ciphers/pull/346
-salsa20  = { git = "https://github.com/RustCrypto/stream-ciphers.git" }
diff --git a/argon2/Cargo.toml b/argon2/Cargo.toml
@@ -18,7 +18,7 @@ rust-version = "1.71"
 
 [dependencies]
 base64ct = "1"
-blake2 = { version = "=0.11.0-pre.3", default-features = false }
+blake2 = { version = "=0.11.0-pre.4", default-features = false }
 
 # optional dependencies
 password-hash = { version = "=0.6.0-pre.0", optional = true }
@@ -39,6 +39,10 @@ std = ["alloc", "password-hash/std"]
 rand = ["password-hash/rand_core"]
 simple = ["password-hash"]
 
+[lints.rust.unexpected_cfgs]
+level = "warn"
+check-cfg = ['cfg(test_large_ram)']
+
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
diff --git a/argon2/tests/kat.rs b/argon2/tests/kat.rs
@@ -452,7 +452,7 @@ ignored_testcase_good!(
 
 // TODO: If version is not provided, verifier incorrectly uses version 0x13
 #[ignore]
-#[cfg(feature = "test_large_ram")]
+#[cfg(test_large_ram)]
 testcase_good!(
     reference_argon2i_v0x10_2_20_1_large_ram,
     Algorithm::Argon2i,
@@ -604,7 +604,7 @@ testcase_good!(
     "$argon2i$v=19$m=65536,t=2,p=1$c29tZXNhbHQ$wWKIMhR9lyDFvRz9YTZweHKfbftvj+qf+YFY4NeBbtA"
 );
 
-#[cfg(feature = "test_large_ram")]
+#[cfg(test_large_ram)]
 testcase_good!(
     reference_argon2i_v0x13_2_20_1,
     Algorithm::Argon2i,

diff --git a/balloon-hash/Cargo.toml b/balloon-hash/Cargo.toml
@@ -14,8 +14,8 @@ edition = "2021"
 rust-version = "1.73"
 
 [dependencies]
-digest = { version = "=0.11.0-pre.8", default-features = false }
-crypto-bigint = { version = "=0.6.0-pre.12", default-features = false, features = ["hybrid-array"] }
+digest = { version = "=0.11.0-pre.9", default-features = false }
+crypto-bigint = { version = "0.6.0-rc.2", default-features = false, features = ["hybrid-array"] }
 
 # optional dependencies
 password-hash = { version = "=0.6.0-pre.0", default-features = false, optional = true }
@@ -24,7 +24,7 @@ zeroize = { version = "1", default-features = false, optional = true }
 
 [dev-dependencies]
 hex-literal = "0.4"
-sha2 = "=0.11.0-pre.3"
+sha2 = "=0.11.0-pre.4"
 
 [features]
 default = ["alloc", "password-hash", "rand"]

diff --git a/balloon-hash/src/lib.rs b/balloon-hash/src/lib.rs
@@ -193,7 +193,7 @@ where
         output: &mut [u8],
     ) -> Result<()> {
         let output = if output.len() == D::OutputSize::USIZE {
-            Array::from_mut_slice(output)
+            <&mut Array<_, _>>::try_from(output).expect("size mismatch")
         } else {
             return Err(Error::OutputSize {
                 actual: output.len(),

diff --git a/bcrypt-pbkdf/Cargo.toml b/bcrypt-pbkdf/Cargo.toml
@@ -14,9 +14,9 @@ edition = "2021"
 rust-version = "1.72"
 
 [dependencies]
-blowfish = { version = "=0.10.0-pre", features = ["bcrypt"] }
+blowfish = { version = "=0.10.0-pre.1", features = ["bcrypt"] }
 pbkdf2 = { version = "=0.13.0-pre.0", default-features = false, path = "../pbkdf2" }
-sha2 = { version = "=0.11.0-pre.3", default-features = false }
+sha2 = { version = "=0.11.0-pre.4", default-features = false }
 zeroize = { version = "1", default-features = false, optional = true }
 
 [dev-dependencies]

diff --git a/bcrypt-pbkdf/src/lib.rs b/bcrypt-pbkdf/src/lib.rs
@@ -257,9 +257,9 @@ mod test {
         ];
 
         for t in tests.iter() {
-            let hpass = Array::from_slice(&t.hpass);
-            let hsalt = Array::from_slice(&t.hsalt);
-            let out = bhash(hpass, hsalt);
+            let hpass = Array(t.hpass);
+            let hsalt = Array(t.hsalt);
+            let out = bhash(&hpass, &hsalt);
             assert_eq!(out[..], t.out[..]);
         }
     }

diff --git a/pbkdf2/Cargo.toml b/pbkdf2/Cargo.toml
@@ -14,21 +14,21 @@ edition = "2021"
 rust-version = "1.72"
 
 [dependencies]
-digest = { version = "=0.11.0-pre.8", features = ["mac"] }
+digest = { version = "=0.11.0-pre.9", features = ["mac"] }
 
 # optional dependencies
 rayon = { version = "1.7", optional = true }
-password-hash = { version = "=0.6.0-pre.0", default-features = false, optional = true, features = ["rand_core"]  }
-hmac = { version = "=0.13.0-pre.3", default-features = false, optional = true }
-sha1 = { version = "=0.11.0-pre.3", default-features = false, optional = true }
-sha2 = { version = "=0.11.0-pre.3", default-features = false, optional = true }
+password-hash = { version = "=0.6.0-pre.0", default-features = false, optional = true, features = ["rand_core"] }
+hmac = { version = "=0.13.0-pre.4", default-features = false, optional = true }
+sha1 = { version = "=0.11.0-pre.4", default-features = false, optional = true }
+sha2 = { version = "=0.11.0-pre.4", default-features = false, optional = true }
 
 [dev-dependencies]
-hmac = "=0.13.0-pre.3"
-hex-literal = "0.4.0"
-sha1 = "=0.11.0-pre.3"
-sha2 = "=0.11.0-pre.3"
-streebog = "=0.11.0-pre.3"
+hmac = "=0.13.0-pre.4"
+hex-literal = "0.4"
+sha1 = "=0.11.0-pre.4"
+sha2 = "=0.11.0-pre.4"
+streebog = "=0.11.0-pre.4"
 
 [features]
 default = ["hmac"]

diff --git a/scrypt/Cargo.toml b/scrypt/Cargo.toml
@@ -15,8 +15,8 @@ rust-version = "1.72"
 
 [dependencies]
 pbkdf2 = { version = "=0.13.0-pre.0", path = "../pbkdf2" }
-salsa20 = { version = "=0.11.0-pre", default-features = false }
-sha2 = { version = "=0.11.0-pre.3", default-features = false }
+salsa20 = { version = "=0.11.0-pre.1", default-features = false }
+sha2 = { version = "=0.11.0-pre.4", default-features = false }
 
 # optional dependencies
 password-hash = { version = "=0.6.0-pre.0", default-features = false, features = ["rand_core"], optional = true }

diff --git a/sha-crypt/Cargo.toml b/sha-crypt/Cargo.toml
@@ -17,7 +17,7 @@ edition = "2021"
 rust-version = "1.72"
 
 [dependencies]
-sha2 = { version = "=0.11.0-pre.3", default-features = false }
+sha2 = { version = "=0.11.0-pre.4", default-features = false }
 
 # optional dependencies
 rand = { version = "0.8", optional = true }