Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Apr 26, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/bcrypt-pbkdf.yml
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 4 additions & 0 deletions .readme/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }

57 changes: 15 additions & 42 deletions Cargo.lock
View file
Open in desktop

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
View file
Open in desktop
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/RustCrypto/block-ciphers.git" }

# 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
View file
Open in desktop
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
View file
Open in desktop
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
Loading