Bump password-hash to v0.6.0-rc.3 (#757)

Also fixes deprecations

Author: tarcieri

Cargo.lock

@@ -15,6 +15,3 @@ exclude = ["benches", "fuzz"]
 
 [profile.dev]
 opt-level = 2
-
-[patch.crates-io.password-hash]
-git = "https://github.com/RustCrypto/traits"

Cargo.toml

@@ -22,15 +22,15 @@ blake2 = { version = "0.11.0-rc.3", default-features = false }
 
 # optional dependencies
 rayon = { version = "1.7", optional = true }
-password-hash = { version = "0.6.0-rc.2", optional = true }
+password-hash = { version = "0.6.0-rc.3", optional = true }
 zeroize = { version = "1", default-features = false, optional = true }
 
 [target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
 cpufeatures = "0.2.17"
 
 [dev-dependencies]
 hex-literal = "1"
-password-hash = { version = "0.6.0-rc.2", features = ["rand_core"] }
+password-hash = { version = "0.6.0-rc.3", features = ["rand_core"] }
 
 [features]
 default = ["alloc", "password-hash", "rand"]

argon2/Cargo.toml

@@ -73,7 +73,10 @@
 )]
 //! # fn main() -> Result<(), Box<dyn std::error::Error>> {
 //! use argon2::{
-//!     password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, phc::Salt},
+//!     password_hash::{
+//!         phc::{PasswordHash, Salt},
+//!         PasswordHasher, PasswordVerifier,
+//!     },
 //!     Algorithm, Argon2, Params, Version
 //! };
 //!
@@ -163,7 +166,7 @@ pub use crate::{
 pub use {
     crate::algorithm::{ARGON2D_IDENT, ARGON2I_IDENT, ARGON2ID_IDENT},
     password_hash::{
-        self, CustomizedPasswordHasher, PasswordHash, PasswordHasher, PasswordVerifier,
+        self, CustomizedPasswordHasher, PasswordHasher, PasswordVerifier, phc::PasswordHash,
     },
 };
 

argon2/src/lib.rs

@@ -7,7 +7,7 @@ use core::str::FromStr;
 #[cfg(feature = "password-hash")]
 use {
     core::fmt::{self, Display},
-    password_hash::{PasswordHash, phc::ParamsString},
+    password_hash::phc::{ParamsString, PasswordHash},
 };
 
 /// Argon2 password hash parameters.

argon2/src/params.rs

@@ -19,7 +19,7 @@ crypto-bigint = { version = "0.7.0-rc.9", default-features = false, features = [
 rand_core = { version = "0.10.0-rc-2", default-features = false }
 
 # optional dependencies
-password-hash = { version = "0.6.0-rc.2", default-features = false, optional = true }
+password-hash = { version = "0.6.0-rc.3", optional = true, default-features = false, features = ["phc"] }
 rayon = { version = "1.7", optional = true }
 zeroize = { version = "1", default-features = false, optional = true }
 

balloon-hash/Cargo.toml

@@ -18,7 +18,7 @@ rust-version = "1.85"
 
 [dependencies]
 getrandom = { version = "0.3", default-features = false }
-password-hash = { version = "0.6.0-rc.2", features = ["alloc", "getrandom"] }
+password-hash = { version = "0.6.0-rc.3", features = ["alloc", "getrandom"] }
 
 # optional dependencies
 argon2 = { version = "0.6.0-rc.0", optional = true, default-features = false, features = ["alloc", "simple"], path = "../argon2" }

password-auth/Cargo.toml

@@ -17,7 +17,7 @@ rust-version = "1.85"
 digest = { version = "0.11.0-rc.4", features = ["mac"] }
 
 # optional dependencies
-password-hash = { version = "0.6.0-rc.2", default-features = false, optional = true, features = ["rand_core"] }
+password-hash = { version = "0.6.0-rc.3", default-features = false, optional = true, features = ["phc", "rand_core"] }
 hmac = { version = "0.13.0-rc.3", default-features = false, optional = true }
 sha1 = { version = "0.11.0-rc.3", default-features = false, optional = true }
 sha2 = { version = "0.11.0-rc.3", default-features = false, optional = true }

pbkdf2/Cargo.toml

@@ -20,15 +20,15 @@ sha2 = { version = "0.11.0-rc.3", default-features = false }
 rayon = { version = "1.11", optional = true }
 
 # optional dependencies
-password-hash = { version = "0.6.0-rc.2", default-features = false, features = ["rand_core"], optional = true }
+password-hash = { version = "0.6.0-rc.3", default-features = false, features = ["phc", "rand_core"], optional = true }
 
 [dev-dependencies]
-password-hash = { version = "0.6.0-rc.2", features = ["rand_core"] }
+password-hash = { version = "0.6.0-rc.3", features = ["rand_core"] }
 
 [features]
 default = ["simple", "rayon"]
-simple = ["password-hash"]
 rayon = ["dep:rayon"]
+simple = ["dep:password-hash"]
 
 [package.metadata.docs.rs]
 all-features = true

scrypt/Cargo.toml

@@ -22,7 +22,7 @@ pub struct Params {
     pub(crate) log_n: u8,
     pub(crate) r: u32,
     pub(crate) p: u32,
-    #[cfg(feature = "password-hash")]
+    #[cfg(feature = "simple")]
     pub(crate) len: Option<usize>,
 }
 
@@ -49,7 +49,7 @@ impl Params {
         log_n: Self::RECOMMENDED_LOG_N,
         r: Self::RECOMMENDED_R,
         p: Self::RECOMMENDED_P,
-        #[cfg(feature = "password-hash")]
+        #[cfg(feature = "simple")]
         len: None,
     };
 
@@ -105,7 +105,7 @@ impl Params {
             log_n,
             r: r as u32,
             p: p as u32,
-            #[cfg(feature = "password-hash")]
+            #[cfg(feature = "simple")]
             len: None,
         })
     }
@@ -119,7 +119,7 @@ impl Params {
     /// The allowed values for `len` are between 10 bytes (80 bits) and 64 bytes inclusive.
     /// These lengths come from the [PHC string format specification](https://github.com/P-H-C/phc-string-format/blob/master/phc-sf-spec.md)
     /// because they are intended for use with password hash strings.
-    #[cfg(feature = "password-hash")]
+    #[cfg(feature = "simple")]
     pub fn new_with_output_len(
         log_n: u8,
         r: u32,
@@ -193,7 +193,7 @@ impl FromStr for Params {
     }
 }
 
-#[cfg(feature = "password-hash")]
+#[cfg(feature = "simple")]
 impl TryFrom<&ParamsString> for Params {
     type Error = Error;