Rename simple features to password-hash (#776)

To reflect the feature activates the integration with the
`password-hash`, this renames the various `simple` features of the
crates in this repo to `password-hash` instead.

It also takes care of wiring up `rand_core` better.

The respective `simple` modules have either been named to `mcf` or `phc`
depending on which format is implemented.

This will make it possible to add another module to crates that support
both, e.g. `pbkdf2` and `scrypt` could both have a `mcf` module.

Closes #764

Author: tarcieri

.github/workflows/argon2.yml

@@ -37,7 +37,7 @@ jobs:
           targets: ${{ matrix.target }}
       - run: cargo build --target ${{ matrix.target }} --no-default-features
       - run: cargo build --target ${{ matrix.target }} --no-default-features --features password-hash
-      - run: cargo build --target ${{ matrix.target }} --no-default-features --features simple
+      - run: cargo build --target ${{ matrix.target }} --no-default-features --features password-hash
       - run: cargo build --target ${{ matrix.target }} --no-default-features --features zeroize
 
   minimal-versions:

.github/workflows/scrypt.yml

@@ -35,7 +35,7 @@ jobs:
           toolchain: ${{ matrix.rust }}
           targets: ${{ matrix.target }}
       - run: cargo build --target ${{ matrix.target }} --no-default-features
-      - run: cargo build --target ${{ matrix.target }} --no-default-features --features simple
+      - run: cargo build --target ${{ matrix.target }} --no-default-features --features password-hash
 
   minimal-versions:
     # disabled until belt-block gets published

.github/workflows/sha-crypt.yml

@@ -35,7 +35,7 @@ jobs:
           toolchain: ${{ matrix.rust }}
           targets: ${{ matrix.target }}
       - run: cargo build --target ${{ matrix.target }} --no-default-features
-      - run: cargo build --target ${{ matrix.target }} --no-default-features --features simple
+      - run: cargo build --target ${{ matrix.target }} --no-default-features --features password-hash
 
   minimal-versions:
     if: false # disabled while using pre-releases

.readme/Cargo.toml

@@ -8,5 +8,5 @@ publish = false
 [dependencies]
 password-hash = "0.6.0-rc.3"
 argon2 = { path = "../argon2" }
-pbkdf2 = { path = "../pbkdf2", features = ["simple"] }
+pbkdf2 = { path = "../pbkdf2", features = ["password-hash"] }
 scrypt = { path = "../scrypt" }

Cargo.lock

@@ -20,3 +20,5 @@ opt-level = 2
 argon2 = { path = "./argon2" }
 pbkdf2 = { path = "./pbkdf2" }
 scrypt = { path = "./scrypt" }
+
+password-hash = { git = "https://github.com/RustCrypto/traits" }

Cargo.toml

@@ -23,7 +23,6 @@ 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.5", optional = true, features = ["phc"] }
-phc = { version = "0.6.0-rc.0", optional = true, features = ["rand_core"] }
 zeroize = { version = "1", default-features = false, optional = true }
 
 [target.'cfg(any(target_arch = "x86", target_arch = "x86_64"))'.dependencies]
@@ -33,12 +32,13 @@ cpufeatures = "0.2.17"
 hex-literal = "1"
 
 [features]
-default = ["alloc", "getrandom", "simple"]
+default = ["alloc", "getrandom", "password-hash"]
 alloc = ["password-hash?/alloc"]
 
-getrandom = ["simple", "password-hash/getrandom"]
+getrandom = ["password-hash/getrandom"]
 parallel = ["dep:rayon"]
-simple = ["password-hash", "phc"]
+password-hash = ["dep:password-hash"]
+rand_core = ["password-hash/rand_core"]
 zeroize = ["dep:zeroize"]
 
 [lints.rust.unexpected_cfgs]

argon2/Cargo.toml

@@ -711,7 +711,7 @@ mod tests {
     }
 
     #[test]
-    fn hash_simple_retains_configured_params() {
+    fn password_hash_retains_configured_params() {
         // Non-default but valid parameters
         let t_cost = 4;
         let m_cost = 2048;

argon2/src/lib.rs

@@ -19,7 +19,6 @@ crypto-bigint = { version = "0.7.0-rc.9", default-features = false, features = [
 
 # optional dependencies
 password-hash = { version = "0.6.0-rc.5", optional = true, default-features = false, features = ["phc"] }
-phc = { version = "0.6.0-rc.0", optional = true, features = ["rand_core"] }
 rayon = { version = "1.7", optional = true }
 zeroize = { version = "1", default-features = false, optional = true }
 
@@ -33,7 +32,8 @@ alloc = ["password-hash/alloc"]
 
 getrandom = ["password-hash/getrandom"]
 parallel = ["dep:rayon"]
-password-hash = ["dep:password-hash", "dep:phc"]
+password-hash = ["dep:password-hash"]
+rand_core = ["password-hash/rand_core"]
 zeroize = ["dep:zeroize"]
 
 [package.metadata.docs.rs]

balloon-hash/Cargo.toml

@@ -9,7 +9,7 @@ use {
         fmt::{self, Display},
         str::FromStr,
     },
-    phc::{ParamsString, PasswordHash},
+    password_hash::phc::{ParamsString, PasswordHash},
 };
 
 /// Balloon password hash parameters.