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

Jump to bottom

Bump dependencies to latest prereleases #511

Merged
merged 1 commit into from
Jul 27, 2024
Merged

Bump dependencies to latest prereleases #511

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
67 changes: 35 additions & 32 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: 0 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,3 @@ 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" }
6 changes: 5 additions & 1 deletion argon2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ rust-version = "1.71"

[dependencies]
base64ct = "1"
blake2 = { version = "=0.11.0-pre.3", default-features = false }
blake2 = { version = "=0.11.0-pre.4", default-features = false }

# optional dependencies
password-hash = { version = "=0.6.0-pre.0", optional = true }
Expand All @@ -39,6 +39,10 @@ std = ["alloc", "password-hash/std"]
rand = ["password-hash/rand_core"]
simple = ["password-hash"]

[lints.rust.unexpected_cfgs]
level = "warn"
check-cfg = ['cfg(test_large_ram)']

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
4 changes: 2 additions & 2 deletions argon2/tests/kat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,7 +452,7 @@ ignored_testcase_good!(

// TODO: If version is not provided, verifier incorrectly uses version 0x13
#[ignore]
#[cfg(feature = "test_large_ram")]
#[cfg(test_large_ram)]
testcase_good!(
reference_argon2i_v0x10_2_20_1_large_ram,
Algorithm::Argon2i,
Expand Down Expand Up @@ -604,7 +604,7 @@ testcase_good!(
"$argon2i$v=19$m=65536,t=2,p=1$c29tZXNhbHQ$wWKIMhR9lyDFvRz9YTZweHKfbftvj+qf+YFY4NeBbtA"
);

#[cfg(feature = "test_large_ram")]
#[cfg(test_large_ram)]
testcase_good!(
reference_argon2i_v0x13_2_20_1,
Algorithm::Argon2i,
Expand Down
6 changes: 3 additions & 3 deletions balloon-hash/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ edition = "2021"
rust-version = "1.73"

[dependencies]
digest = { version = "=0.11.0-pre.8", default-features = false }
crypto-bigint = { version = "=0.6.0-pre.12", default-features = false, features = ["hybrid-array"] }
digest = { version = "=0.11.0-pre.9", default-features = false }
crypto-bigint = { version = "0.6.0-rc.2", default-features = false, features = ["hybrid-array"] }

# optional dependencies
password-hash = { version = "=0.6.0-pre.0", default-features = false, optional = true }
Expand All @@ -24,7 +24,7 @@ zeroize = { version = "1", default-features = false, optional = true }

[dev-dependencies]
hex-literal = "0.4"
sha2 = "=0.11.0-pre.3"
sha2 = "=0.11.0-pre.4"

[features]
default = ["alloc", "password-hash", "rand"]
Expand Down
2 changes: 1 addition & 1 deletion balloon-hash/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ where
output: &mut [u8],
) -> Result<()> {
let output = if output.len() == D::OutputSize::USIZE {
Array::from_mut_slice(output)
<&mut Array<_, _>>::try_from(output).expect("size mismatch")
} else {
return Err(Error::OutputSize {
actual: output.len(),
Expand Down
4 changes: 2 additions & 2 deletions bcrypt-pbkdf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ edition = "2021"
rust-version = "1.72"

[dependencies]
blowfish = { version = "=0.10.0-pre", features = ["bcrypt"] }
blowfish = { version = "=0.10.0-pre.1", features = ["bcrypt"] }
pbkdf2 = { version = "=0.13.0-pre.0", default-features = false, path = "../pbkdf2" }
sha2 = { version = "=0.11.0-pre.3", default-features = false }
sha2 = { version = "=0.11.0-pre.4", default-features = false }
zeroize = { version = "1", default-features = false, optional = true }

[dev-dependencies]
Expand Down
6 changes: 3 additions & 3 deletions bcrypt-pbkdf/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,9 +257,9 @@ mod test {
];

for t in tests.iter() {
let hpass = Array::from_slice(&t.hpass);
let hsalt = Array::from_slice(&t.hsalt);
let out = bhash(hpass, hsalt);
let hpass = Array(t.hpass);
let hsalt = Array(t.hsalt);
let out = bhash(&hpass, &hsalt);
assert_eq!(out[..], t.out[..]);
}
}
Expand Down
20 changes: 10 additions & 10 deletions pbkdf2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ edition = "2021"
rust-version = "1.72"

[dependencies]
digest = { version = "=0.11.0-pre.8", features = ["mac"] }
digest = { version = "=0.11.0-pre.9", features = ["mac"] }

# optional dependencies
rayon = { version = "1.7", optional = true }
password-hash = { version = "=0.6.0-pre.0", default-features = false, optional = true, features = ["rand_core"] }
hmac = { version = "=0.13.0-pre.3", default-features = false, optional = true }
sha1 = { version = "=0.11.0-pre.3", default-features = false, optional = true }
sha2 = { version = "=0.11.0-pre.3", default-features = false, optional = true }
password-hash = { version = "=0.6.0-pre.0", default-features = false, optional = true, features = ["rand_core"] }
hmac = { version = "=0.13.0-pre.4", default-features = false, optional = true }
sha1 = { version = "=0.11.0-pre.4", default-features = false, optional = true }
sha2 = { version = "=0.11.0-pre.4", default-features = false, optional = true }

[dev-dependencies]
hmac = "=0.13.0-pre.3"
hex-literal = "0.4.0"
sha1 = "=0.11.0-pre.3"
sha2 = "=0.11.0-pre.3"
streebog = "=0.11.0-pre.3"
hmac = "=0.13.0-pre.4"
hex-literal = "0.4"
sha1 = "=0.11.0-pre.4"
sha2 = "=0.11.0-pre.4"
streebog = "=0.11.0-pre.4"

[features]
default = ["hmac"]
Expand Down
4 changes: 2 additions & 2 deletions scrypt/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ rust-version = "1.72"

[dependencies]
pbkdf2 = { version = "=0.13.0-pre.0", path = "../pbkdf2" }
salsa20 = { version = "=0.11.0-pre", default-features = false }
sha2 = { version = "=0.11.0-pre.3", default-features = false }
salsa20 = { version = "=0.11.0-pre.1", default-features = false }
sha2 = { version = "=0.11.0-pre.4", default-features = false }

# optional dependencies
password-hash = { version = "=0.6.0-pre.0", default-features = false, features = ["rand_core"], optional = true }
Expand Down
2 changes: 1 addition & 1 deletion sha-crypt/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ edition = "2021"
rust-version = "1.72"

[dependencies]
sha2 = { version = "=0.11.0-pre.3", default-features = false }
sha2 = { version = "=0.11.0-pre.4", default-features = false }

# optional dependencies
rand = { version = "0.8", optional = true }
Expand Down
Loading