diff --git a/Cargo.lock b/Cargo.lock index b6f74ea6..9a5e488e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -426,8 +426,9 @@ dependencies = [ [[package]] name = "salsa20" -version = "0.11.0-pre.1" -source = "git+https://github.com/RustCrypto/stream-ciphers.git#9fcbf802c3ec29672f6fa2f22fc6ac1abce24996" +version = "0.11.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1affa54a576c40080654b494bb3f3198fa2fe46e0954b85196d122e3561c2fd0" dependencies = [ "cfg-if", "cipher", @@ -441,7 +442,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scrypt" -version = "0.12.0-pre.1" +version = "0.12.0-pre.2" dependencies = [ "password-hash", "pbkdf2", diff --git a/Cargo.toml b/Cargo.toml index b1e321bd..a61f628e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,3 @@ exclude = ["benches"] [profile.dev] opt-level = 2 - -[patch.crates-io] -# https://github.com/RustCrypto/stream-ciphers/pull/368 -salsa20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" } diff --git a/password-auth/Cargo.toml b/password-auth/Cargo.toml index a1ab34ca..806550de 100644 --- a/password-auth/Cargo.toml +++ b/password-auth/Cargo.toml @@ -23,7 +23,7 @@ rand_core = { version = "0.6", features = ["getrandom"] } # optional dependencies argon2 = { version = "=0.6.0-pre.1", optional = true, default-features = false, features = ["alloc", "simple"], path = "../argon2" } pbkdf2 = { version = "=0.13.0-pre.1", optional = true, default-features = false, features = ["simple"], path = "../pbkdf2" } -scrypt = { version = "=0.12.0-pre.1", optional = true, default-features = false, features = ["simple"], path = "../scrypt" } +scrypt = { version = "=0.12.0-pre.2", optional = true, default-features = false, features = ["simple"], path = "../scrypt" } [features] default = ["argon2", "std"] diff --git a/scrypt/Cargo.toml b/scrypt/Cargo.toml index 7bce5d91..c2725575 100644 --- a/scrypt/Cargo.toml +++ b/scrypt/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "scrypt" -version = "0.12.0-pre.1" +version = "0.12.0-pre.2" description = "Scrypt password-based key derivation function" authors = ["RustCrypto Developers"] license = "MIT OR Apache-2.0" @@ -15,7 +15,7 @@ rust-version = "1.81" [dependencies] pbkdf2 = { version = "=0.13.0-pre.1", path = "../pbkdf2" } -salsa20 = { version = "=0.11.0-pre.1", default-features = false } +salsa20 = { version = "=0.11.0-pre.2", default-features = false } sha2 = { version = "=0.11.0-pre.4", default-features = false } # optional dependencies diff --git a/yescrypt/Cargo.toml b/yescrypt/Cargo.toml index 473ee04b..f6b17591 100644 --- a/yescrypt/Cargo.toml +++ b/yescrypt/Cargo.toml @@ -17,7 +17,7 @@ rust-version = "1.81" libc = "0.2" hmac = { version = "0.13.0-pre.4", default-features = false } pbkdf2 = { version = "=0.13.0-pre.1", path = "../pbkdf2" } -salsa20 = { version = "=0.11.0-pre.1", default-features = false } +salsa20 = { version = "=0.11.0-pre.2", default-features = false } sha2 = { version = "=0.11.0-pre.4", default-features = false } [dev-dependencies]