diff --git a/Cargo.lock b/Cargo.lock index 5100704d..75e8ee85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -110,12 +110,13 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chacha20" -version = "0.7.0-pre" -source = "git+https://github.com/RustCrypto/stream-ciphers.git#6a2d54abb3e96871c158eb5991f3e24529a55ab3" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb7d73af580730a193e74406308c3fa0b29914a434b1db7626998bf4cd9f3087" dependencies = [ "cfg-if", "cipher", - "cpuid-bool", + "cpufeatures", "zeroize", ] @@ -328,8 +329,9 @@ dependencies = [ [[package]] name = "kuznyechik" -version = "0.7.0-pre" -source = "git+https://github.com/RustCrypto/block-ciphers.git#db3763260d02187f841ee57a51a83ce60045013d" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0865d64349fd4b3aaf478b279af022717585d95780c038919c60fe042aff30b0" dependencies = [ "cipher", "opaque-debug", @@ -462,8 +464,9 @@ dependencies = [ [[package]] name = "salsa20" -version = "0.8.0-pre" -source = "git+https://github.com/RustCrypto/stream-ciphers.git#6a2d54abb3e96871c158eb5991f3e24529a55ab3" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c7c5f10864beba947e1a1b43f3ef46c8cc58d1c2ae549fa471713e8ff60787a" dependencies = [ "cipher", "zeroize", diff --git a/Cargo.toml b/Cargo.toml index 5693333a..6cb65aa3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,8 +10,3 @@ members = [ "mgm", "xsalsa20poly1305" ] - -[patch.crates-io] -chacha20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" } -kuznyechik = { git = "https://github.com/RustCrypto/block-ciphers.git" } -salsa20 = { git = "https://github.com/RustCrypto/stream-ciphers.git" } diff --git a/chacha20poly1305/Cargo.toml b/chacha20poly1305/Cargo.toml index 31ac2afb..54f6607b 100644 --- a/chacha20poly1305/Cargo.toml +++ b/chacha20poly1305/Cargo.toml @@ -19,7 +19,7 @@ categories = ["cryptography", "no-std"] [dependencies] aead = { version = "0.4", default-features = false } -chacha20 = { version = "=0.7.0-pre", features = ["zeroize"], optional = true } +chacha20 = { version = "0.7", features = ["zeroize"], optional = true } cipher = "0.3" poly1305 = "0.6" zeroize = { version = "1", default-features = false } diff --git a/crypto_box/Cargo.toml b/crypto_box/Cargo.toml index f51af1d1..3212dc8a 100644 --- a/crypto_box/Cargo.toml +++ b/crypto_box/Cargo.toml @@ -18,7 +18,7 @@ keywords = ["nacl", "libsodium", "public-key", "x25519", "xsalsa20poly1305"] [dependencies] rand_core = "0.5" -salsa20 = { version = "=0.8.0-pre", features = ["hsalsa20"] } +salsa20 = { version = "0.8", features = ["hsalsa20"] } x25519-dalek = { version = "1", default-features = false } zeroize = { version = "1", default-features = false } diff --git a/mgm/Cargo.toml b/mgm/Cargo.toml index 53cbbfae..13be13d7 100644 --- a/mgm/Cargo.toml +++ b/mgm/Cargo.toml @@ -19,7 +19,7 @@ subtle = { version = "2", default-features = false } [dev-dependencies] aead = { version = "0.4", features = ["dev"], default-features = false } -kuznyechik = "=0.7.0-pre" +kuznyechik = "0.7" hex-literal = "0.2" [features] diff --git a/xsalsa20poly1305/Cargo.toml b/xsalsa20poly1305/Cargo.toml index 30a78f8d..63f61927 100644 --- a/xsalsa20poly1305/Cargo.toml +++ b/xsalsa20poly1305/Cargo.toml @@ -16,7 +16,7 @@ categories = ["cryptography", "no-std"] [dependencies] aead = { version = "0.4", default-features = false } -salsa20 = { version = "=0.8.0-pre", features = ["xsalsa20", "zeroize"] } +salsa20 = { version = "0.8", features = ["xsalsa20", "zeroize"] } poly1305 = "0.6" rand_core = { version = "0.5", optional = true } subtle = { version = "2", default-features = false }