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

scrypt: bump salsa20 crate dependency to v0.8 #166

Merged
merged 1 commit into from Apr 29, 2021
Merged

scrypt: bump salsa20 crate dependency to v0.8 #166

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 13 additions & 4 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.

2 changes: 1 addition & 1 deletion scrypt/Cargo.toml
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@ base64ct = { version = "1", default-features = false, features = ["alloc"], opti
hmac = "0.11"
password-hash = { version = "0.2", default-features = false, features = ["rand_core"], optional = true }
pbkdf2 = { version = "0.7", default-features = false, path = "../pbkdf2" }
salsa20 = { version = "0.7", default-features = false, features = ["expose-core"] }
salsa20 = { version = "0.8", default-features = false, features = ["expose-core"] }
sha2 = { version = "0.9", default-features = false }

[dev-dependencies]
Expand Down
2 changes: 1 addition & 1 deletion scrypt/src/romix.rs
View file
Open in desktop
@@ -1,7 +1,7 @@
use core::convert::TryInto;

/// The Salsa20/8 core function
type Salsa20_8 = salsa20::Block<salsa20::R8>;
type Salsa20_8 = salsa20::Core<salsa20::R8>;

/// Execute the ROMix operation in-place.
/// b - the data to operate on
Expand Down