Bump hmac and crypto-mac dependencies to v0.10 (RustCrypto#58)

Author: tarcieri

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "bcrypt-pbkdf"
 description = "bcrypt-pbkdf password-based key derivation function"
-version = "0.3.0"
+version = "0.4.0-pre"
 authors = ["RustCrypto Developers"]
 repository = "https://github.com/RustCrypto/password-hashes/tree/master/bcrypt-pbkdf"
 keywords = ["crypto", "password", "hashing"]
@@ -10,9 +10,9 @@ license = "MIT OR Apache-2.0"
 edition = "2018"
 
 [dependencies]
-blowfish = { version = "0.6", features = ["bcrypt"] }
-crypto-mac = "0.9"
-pbkdf2 = { version = "0.5", default-features = false }
+blowfish = { version = "0.7", features = ["bcrypt"] }
+crypto-mac = "0.10"
+pbkdf2 = { version = "0.6.0-pre", default-features = false, path = "../pbkdf2" }
 sha2 = { version = "0.9", default-features = false }
 zeroize = { version = "1", default-features = false }
 

bcrypt-pbkdf/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pbkdf2"
-version = "0.5.0"
+version = "0.6.0-pre"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 description = "Generic implementation of PBKDF2"
@@ -11,18 +11,18 @@ categories = ["cryptography", "no-std"]
 edition = "2018"
 
 [dependencies]
-crypto-mac = "0.9"
+crypto-mac = "0.10"
 
 rayon = { version = "1", optional = true }
 base64 = { version = "0.13", default-features = false, features = ["alloc"], optional = true }
 rand = { version = "0.7", default-features = false, optional = true }
 rand_core = { version = "0.5", default-features = false, features = ["getrandom"], optional = true }
-hmac = { version = "0.9", default-features = false, optional = true }
+hmac = { version = "0.10", default-features = false, optional = true }
 sha2 = { version = "0.9", default-features = false, optional = true }
 subtle = { version = "2", default-features = false, optional = true }
 
 [dev-dependencies]
-hmac = "0.9"
+hmac = "0.10"
 sha-1 = "0.9"
 sha2 = "0.9"
 

pbkdf2/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "scrypt"
-version = "0.4.1"
+version = "0.5.0-pre"
 authors = ["RustCrypto Developers"]
 license = "MIT OR Apache-2.0"
 description = "Scrypt password-based key derivation function"
@@ -11,8 +11,8 @@ categories = ["cryptography"]
 edition = "2018"
 
 [dependencies]
-hmac = "0.9"
-pbkdf2 = { version = "0.5", default-features = false, path = "../pbkdf2" }
+hmac = "0.10"
+pbkdf2 = { version = "0.6.0-pre", default-features = false, path = "../pbkdf2" }
 sha2 = { version = "0.9", default-features = false }
 
 base64 = { version = "0.13", default-features = false, features = ["alloc"], optional = true }

scrypt/Cargo.toml

@@ -79,7 +79,7 @@ pub fn scrypt(
     // This check required by Scrypt:
     // check output.len() > 0 && output.len() <= (2^32 - 1) * 32
     if output.is_empty() || output.len() / 32 > 0xffff_ffff {
-        Err(errors::InvalidOutputLen)?;
+        return Err(errors::InvalidOutputLen);
     }
 
     // The checks in the ScryptParams constructor guarantee

scrypt/src/lib.rs

@@ -26,7 +26,7 @@ impl ScryptParams {
         let cond2 = size_of::<usize>() >= size_of::<u32>();
         let cond3 = r <= usize::MAX as u32 && p < usize::MAX as u32;
         if !(r > 0 && p > 0 && cond1 && (cond2 || cond3)) {
-            Err(InvalidParams)?;
+            return Err(InvalidParams);
         }
 
         let r = r as usize;
@@ -47,15 +47,15 @@ impl ScryptParams {
         // check: n < 2^(128 * r / 8)
         // r * 16 won't overflow since r128 didn't
         if (log_n as usize) >= r * 16 {
-            Err(InvalidParams)?;
+            return Err(InvalidParams);
         }
 
         // This check required by Scrypt:
         // check: p <= ((2^32-1) * 32) / (128 * r)
         // It takes a bit of re-arranging to get the check above into this form,
         // but it is indeed the same.
         if r * p >= 0x4000_0000 {
-            Err(InvalidParams)?;
+            return Err(InvalidParams);
         }
 
         Ok(ScryptParams {

scrypt/src/params.rs

@@ -135,6 +135,6 @@ pub fn scrypt_check(password: &str, hashed_value: &str) -> Result<(), CheckError
     if output.ct_eq(&hash).unwrap_u8() == 1 {
         Ok(())
     } else {
-        Err(CheckError::HashMismatch)?
+        Err(CheckError::HashMismatch)
     }
 }