bcrypt-pbkdf: scrypt: bump cipher to 0.5.0-pre.4

.github/workflows/bcrypt-pbkdf.yml

@@ -37,6 +37,8 @@ jobs:
       - run: cargo build --no-default-features --target ${{ matrix.target }}
 
   minimal-versions:
+    # disabled until belt-block gets published
+    if: false
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}

.github/workflows/scrypt.yml

@@ -38,6 +38,8 @@ jobs:
       - run: cargo build --target ${{ matrix.target }} --no-default-features --features simple
 
   minimal-versions:
+    # disabled until belt-block gets published
+    if: false
     uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
     with:
         working-directory: ${{ github.workflow }}

.readme/Cargo.toml

@@ -12,3 +12,7 @@ password-hash = "0.5"
 argon2 = { path = "../argon2" }
 pbkdf2 = { path = "../pbkdf2", features = ["simple"] }
 scrypt = { path = "../scrypt" }
+
+[patch.crates-io]
+salsa20  = { git = "https://github.com/RustCrypto/stream-ciphers.git" }
+

Cargo.toml

@@ -13,3 +13,11 @@ exclude = ["benches"]
 
 [profile.dev]
 opt-level = 2
+
+[patch.crates-io]
+# https://github.com/RustCrypto/block-ciphers/pull/413
+blowfish = { git = "https://github.com/baloo/block-ciphers.git", branch = "baloo/bump-cipher/0.5.0-pre.4" }
+
+# 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" }

bcrypt-pbkdf/Cargo.toml

@@ -13,7 +13,7 @@ edition = "2021"
 rust-version = "1.72"
 
 [dependencies]
-blowfish = { version = "0.9.1", features = ["bcrypt"] }
+blowfish = { version = "=0.10.0-pre", features = ["bcrypt"] }
 pbkdf2 = { version = "=0.13.0-pre.0", default-features = false, path = "../pbkdf2" }
 sha2 = { version = "=0.11.0-pre.3", default-features = false }
 zeroize = { version = "1", default-features = false, optional = true }

scrypt/Cargo.toml

@@ -14,7 +14,7 @@ rust-version = "1.72"
 
 [dependencies]
 pbkdf2 = { version = "=0.13.0-pre.0", path = "../pbkdf2" }
-salsa20 = { version = "0.10.2", default-features = false }
+salsa20 = { version = "=0.11.0-pre", default-features = false }
 sha2 = { version = "=0.11.0-pre.3", default-features = false }
 
 # optional dependencies