Bump to pre-releases

 - password-hash =0.6.0-pre.0
 - digest =0.11.0-pre.8
 - curve25519-dalek =4.2.0-pre
 - scrypt =0.12.0-pre.0
 - sha1 =0.11.0-pre.3
 - sha2 =0.11.0-pre.3
 - hkdf =0.13.0-pre.3

Cargo.toml

@@ -8,3 +8,13 @@ members = [
 
 [profile.dev]
 opt-level = 2
+
+[patch.crates-io]
+curve25519-dalek = { git = "https://github.com/baloo/curve25519-dalek.git", branch = "baloo/rust-crypto/digest-sha2-bumps" }
+
+# https://github.com/RustCrypto/password-hashes/pull/497
+scrypt = { git = "https://github.com/RustCrypto/password-hashes.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" }

aucpace/Cargo.toml

@@ -15,11 +15,11 @@ edition = "2021"
 rust-version = "1.61"
 
 [dependencies]
-curve25519-dalek = { version = "4", default-features = false, features = [
+curve25519-dalek = { version = "=4.2.0-pre", default-features = false, features = [
     "digest",
     "rand_core",
 ] }
-password-hash = { version = "0.5", default-features = false, features = [
+password-hash = { version = "=0.6.0-pre.0", default-features = false, features = [
     "rand_core",
 ] }
 rand_core = { version = "0.6", default-features = false }
@@ -28,19 +28,19 @@ serde = { version = "1.0.184", default-features = false, optional = true, featur
 ] }
 serde-byte-array = { version = "0.1", optional = true }
 subtle = { version = "2.4", default-features = false }
-scrypt = { version = "0.11", default-features = false, optional = true, features = [
+scrypt = { version = "=0.12.0-pre.0", default-features = false, optional = true, features = [
     "simple",
 ] }
-sha2 = { version = "0.10", default-features = false, optional = true }
+sha2 = { version = "=0.11.0-pre.3", default-features = false, optional = true }
 
 [dev-dependencies]
 bincode = "1"
-curve25519-dalek = { version = "4", features = ["digest", "rand_core"] }
-password-hash = { version = "0.5", features = ["rand_core"] }
+curve25519-dalek = { version = "=4.2.0-pre", features = ["digest", "rand_core"] }
+password-hash = { version = "=0.6.0-pre.0", features = ["rand_core"] }
 postcard = "1"
 rand_core = "0.6"
-scrypt = { version = "0.11", features = ["simple"] }
-sha2 = "0.10"
+scrypt = { version = "=0.12.0-pre.0", features = ["simple"] }
+sha2 = "=0.11.0-pre.3"
 
 [features]
 default = ["scrypt", "sha2", "getrandom"]

aucpace/examples/key_agreement.rs

@@ -231,8 +231,8 @@ fn main() -> Result<()> {
     let server_key: Output<Sha512> = server_thread.join().unwrap().unwrap();
     assert_eq!(client_key, server_key);
     println!(
-        "Negotiation finished, both parties arrived at a key of: {:X}",
-        client_key
+        "Negotiation finished, both parties arrived at a key of: {:X?}",
+        client_key.as_slice()
     );
     println!(
         "Client sent {} bytes total",

aucpace/examples/key_agreement_no_std.rs

@@ -225,8 +225,8 @@ fn main() -> Result<()> {
     // assert that both threads arrived at the same key
     assert_eq!(client_key, server_key);
     println!(
-        "Negotiation finished, both parties arrived at a key of: {:X}",
-        client_key
+        "Negotiation finished, both parties arrived at a key of: {:X?}",
+        client_key.as_slice()
     );
 
     println!("Client sent {} bytes total", client_bytes_sent);

aucpace/examples/key_agreement_partial_aug.rs

@@ -239,8 +239,8 @@ fn main() -> Result<()> {
     let server_key: Output<Sha512> = server_thread.join().unwrap().unwrap();
     assert_eq!(client_key, server_key);
     println!(
-        "Negotiation finished, both parties arrived at a key of: {:X}",
-        client_key
+        "Negotiation finished, both parties arrived at a key of: {:X?}",
+        client_key.as_slice()
     );
     println!(
         "Client sent {} bytes total",

aucpace/examples/key_agreement_strong.rs

@@ -235,8 +235,8 @@ fn main() -> Result<()> {
     let server_key: Output<Sha512> = server_thread.join().unwrap().unwrap();
     assert_eq!(client_key, server_key);
     println!(
-        "Negotiation finished, both parties arrived at a key of: {:X}",
-        client_key
+        "Negotiation finished, both parties arrived at a key of: {:X?}",
+        client_key.as_slice()
     );
     println!(
         "Client sent {} bytes total",

spake2/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "spake2"
-version = "0.4.0"
+version = "0.4.1-pre"
 authors = ["Brian Warner <warner@lothar.com>"]
 description = "The SPAKE2 password-authenticated key-exchange algorithm."
 documentation = "https://docs.rs/spake2"
@@ -15,10 +15,10 @@ edition = "2021"
 rust-version = "1.60"
 
 [dependencies]
-curve25519-dalek = { version = "4", default-features = false, features = ["rand_core"] }
+curve25519-dalek = { version = "=4.2.0-pre", default-features = false, features = ["rand_core"] }
 rand_core = { version = "0.6", default-features = false }
-sha2 = { version = "0.10", default-features = false }
-hkdf = { version = "0.12", default-features = false }
+sha2 = { version = "=0.11.0-pre.3", default-features = false }
+hkdf = { version = "=0.13.0-pre.3", default-features = false }
 
 [dev-dependencies]
 bencher = "0.1"

srp/Cargo.toml

@@ -14,14 +14,13 @@ rust-version = "1.61"
 
 [dependencies]
 num-bigint = "0.4"
-generic-array = "0.14"
-digest = "0.10"
+digest = "=0.11.0-pre.8"
 lazy_static = "1.2"
 subtle = "2.4"
 
 [dev-dependencies]
 hex-literal = "0.4"
 num-traits = "0.2"
 rand = "0.8"
-sha1 = "0.10"
-sha2 = "0.10"
+sha1 = "=0.11.0-pre.3"
+sha2 = "=0.11.0-pre.3"