Skip to content

Commit

Permalink
blowfish: scrypt: bump cipher to 0.5.0-pre.4
Browse files Browse the repository at this point in the history
  • Loading branch information
baloo committed Mar 5, 2024
1 parent fe67dc8 commit 4327878
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 44 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/bcrypt-pbkdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/scrypt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
57 changes: 15 additions & 42 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 1 addition & 1 deletion bcrypt-pbkdf/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion scrypt/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4327878

Please sign in to comment.