Bump rand_core to v0.10.0-rc-2

This also accordingly bumps all of the underlying crates to versions
which (transitively) depend on the `rand`/`rand_core` v0.10 release
series

Author: tarcieri

Cargo.lock

@@ -12,3 +12,10 @@ debug = true
 
 [patch.crates-io]
 ml-kem = { path = "./ml-kem" }
+
+elliptic-curve = { git = "https://github.com/RustCrypto/traits" }
+ff = { git = "https://github.com/tarcieri/ff", branch = "rand_core/v0.10.0-rc-2" }
+group = { git = "https://github.com/tarcieri/group", branch = "rand_core/v0.10.0-rc-2" }
+p256 = { git = "https://github.com/RustCrypto/elliptic-curves " }
+primefield = { git = "https://github.com/RustCrypto/elliptic-curves " }
+x25519-dalek = { git = "https://github.com/dalek-cryptography/curve25519-dalek", branch = "rand_core/v0.10-rc" }

Cargo.toml

@@ -14,18 +14,24 @@ keywords = ["crypto", "ecdh", "ecc"]
 readme = "README.md"
 
 [dependencies]
-kem = "=0.4.0-pre.1"
-rand_core = "0.9.0"
+kem = "=0.4.0-pre.2"
+rand_core = "0.10.0-rc-2"
 
 # optional dependencies
 elliptic-curve = { version = "0.14.0-rc.16", optional = true, default-features = false }
 k256 = { version = "0.14.0-rc.0", optional = true, default-features = false, features = ["arithmetic"] }
 p256 = { version = "0.14.0-rc.0", optional = true, default-features = false, features = ["arithmetic"] }
 p384 = { version = "0.14.0-rc.0", optional = true, default-features = false, features = ["arithmetic"] }
 p521 = { version = "0.14.0-rc.0", optional = true, default-features = false, features = ["arithmetic"] }
-x25519 = { version = "=3.0.0-pre.0", package = "x25519-dalek", optional = true, default-features = false }
+x25519 = { version = "=3.0.0-pre.1", package = "x25519-dalek", optional = true, default-features = false }
 zeroize = { version = "1.8.1", optional = true, default-features = false }
 
+[dev-dependencies]
+hex-literal = "1"
+hkdf = "0.13.0-rc.3"
+rand = "0.10.0-rc.1"
+sha2 = "0.11.0-rc.3"
+
 [features]
 default = ["zeroize"]
 ecdh = ["dep:elliptic-curve", "elliptic-curve/ecdh"]
@@ -36,12 +42,6 @@ p521 = ["dep:p521", "ecdh"]
 x25519 = ["dep:x25519", "x25519/reusable_secrets"]
 zeroize = ["dep:zeroize"]
 
-[dev-dependencies]
-hex-literal = "1"
-hkdf = "0.13.0-rc.0"
-rand = "0.9.2"
-sha2 = "0.11.0-rc.2"
-
 [package.metadata.docs.rs]
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]

dhkem/Cargo.toml

@@ -55,17 +55,17 @@ openssl-shake = ["dep:openssl-sys"]
 serde = ["dep:hex", "dep:serde"]
 
 [dependencies]
-aes = { version = "0.9.0-rc.0", optional = true }
+aes = { version = "0.9.0-rc.2", optional = true }
 hex = { version = "0.4", optional = true }
 openssl-sys = { version = "0.9.104", optional = true }
-rand_core = { version = "0.9", features = [] }
+rand_core = { version = "0.10.0-rc-2", features = [] }
 serde = { version = "1.0", features = ["derive"], optional = true }
 serdect = "0.4"
 subtle = "2.6"
 thiserror = "2.0"
 
 [target.'cfg(target_arch = "aarch64")'.dependencies]
-sha3 = { version = "0.11.0-rc.0", features = ["asm"] }
+sha3 = { version = "0.11.0-rc.3", features = ["asm"] }
 zeroize = { version = "1", features = ["aarch64"] }
 
 [target.'cfg(any(target_arch = "x86_64", target_arch = "x86"))'.dependencies]
@@ -78,21 +78,21 @@ sha3 = { version = "0.11.0-rc.0" }
 zeroize = "1"
 
 [dev-dependencies]
-aes = "0.9.0-rc.0"
+aes = "0.9.0-rc.2"
 bincode = "1.3"
-criterion = "0.5"
+criterion = "0.7"
 hex = "0.4"
 hybrid-array = "0.4"
-rand_core = { version = "0.9", features = ["os_rng"] }
-rand_chacha = "0.9"
+rand = "0.10.0-rc.1"
+chacha20 = "0.10.0-rc.3"
 rstest = "0.26"
 safe-oqs = { version = "0.10", default-features = false, features = ["frodokem"] }
 postcard = { version = "1.0", features = ["use-std"] }
 serde_bare = "0.5"
 serde_cbor = "0.11"
 serde_json = "1.0"
 serde_yaml = "0.9"
-toml = "0.8"
+toml = "0.9"
 
 [package.metadata.docs.rs]
 features = [

frodo-kem/Cargo.toml

@@ -5,7 +5,7 @@ use frodo_kem::*;
 use rand_core::SeedableRng;
 
 fn bench_keygen<M: Measurement>(group: &mut BenchmarkGroup<'_, M>) {
-    let mut rng = rand_chacha::ChaCha8Rng::from_os_rng();
+    let mut rng = chacha20::ChaCha8Rng::from_os_rng();
     group.bench_function("KeyGen 640Aes", |b| {
         b.iter(|| {
             let (_pk, _sk) = Algorithm::FrodoKem640Aes.generate_keypair(&mut rng);
@@ -44,7 +44,7 @@ fn bench_keygen<M: Measurement>(group: &mut BenchmarkGroup<'_, M>) {
 }
 
 fn bench_encapsulate<M: Measurement>(group: &mut BenchmarkGroup<'_, M>) {
-    let mut rng = rand_chacha::ChaCha8Rng::from_os_rng();
+    let mut rng = chacha20::ChaCha8Rng::from_os_rng();
     let (pk, _sk) = Algorithm::FrodoKem640Aes.generate_keypair(&mut rng);
     group.bench_function("Encapsulate 640Aes", |b| {
         b.iter(|| {
@@ -101,7 +101,7 @@ fn bench_encapsulate<M: Measurement>(group: &mut BenchmarkGroup<'_, M>) {
 }
 
 fn bench_decapsulate<M: Measurement>(group: &mut BenchmarkGroup<'_, M>) {
-    let mut rng = rand_chacha::ChaCha8Rng::from_os_rng();
+    let mut rng = chacha20::ChaCha8Rng::from_os_rng();
     let (pk, sk) = Algorithm::FrodoKem640Aes.generate_keypair(&mut rng);
     let (ct, _ss) = Algorithm::FrodoKem640Aes
         .encapsulate_with_rng(&pk, &mut rng)

frodo-kem/benches/frodo.rs

@@ -6,7 +6,7 @@ use frodo_kem::*;
 use rand_core::SeedableRng;
 
 fn bench_keygen<M: Measurement>(group: &mut BenchmarkGroup<'_, M>) {
-    let mut rng = rand_chacha::ChaCha8Rng::from_os_rng();
+    let mut rng = chacha20::ChaCha8Rng::from_os_rng();
     group.bench_function("KeyGen 640Aes", |b| {
         b.iter(|| {
             let (_pk, _sk) = Algorithm::EphemeralFrodoKem640Aes.generate_keypair(&mut rng);
@@ -81,7 +81,7 @@ fn bench_keygen<M: Measurement>(group: &mut BenchmarkGroup<'_, M>) {
 }
 
 fn bench_encapsulate<M: Measurement>(group: &mut BenchmarkGroup<'_, M>) {
-    let mut rng = rand_chacha::ChaCha8Rng::from_os_rng();
+    let mut rng = chacha20::ChaCha8Rng::from_os_rng();
     let (pk, _sk) = Algorithm::EphemeralFrodoKem640Aes.generate_keypair(&mut rng);
     group.bench_function("Encapsulate 640Aes", |b| {
         b.iter(|| {
@@ -180,7 +180,7 @@ fn bench_encapsulate<M: Measurement>(group: &mut BenchmarkGroup<'_, M>) {
 }
 
 fn bench_decapsulate<M: Measurement>(group: &mut BenchmarkGroup<'_, M>) {
-    let mut rng = rand_chacha::ChaCha8Rng::from_os_rng();
+    let mut rng = chacha20::ChaCha8Rng::from_os_rng();
     let (pk, sk) = Algorithm::EphemeralFrodoKem640Aes.generate_keypair(&mut rng);
     let (ct, _ss) = Algorithm::EphemeralFrodoKem640Aes
         .encapsulate_with_rng(&pk, &mut rng)

frodo-kem/benches/safe_oqs.rs

@@ -181,7 +181,7 @@ mod tests {
         let my_pk = EncryptionKey::<F>::from_slice(their_pk.as_ref()).unwrap();
         let my_sk = DecryptionKey::<F>::from_slice(their_sk.as_ref()).unwrap();
 
-        let mut rng = rand_chacha::ChaCha8Rng::from_seed([1u8; 32]);
+        let mut rng = chacha20::ChaCha8Rng::from_seed([1u8; 32]);
 
         let (my_ct, my_ess) = kem.encapsulate_with_rng(&my_pk, &mut rng);
         let (my_ss, _) = kem.decapsulate(&my_sk, &my_ct);
@@ -227,7 +227,7 @@ mod tests {
         #[case] kem: F,
         #[case] alg: safe_oqs::kem::Algorithm,
     ) {
-        let mut rng = rand_chacha::ChaCha8Rng::from_seed([1u8; 32]);
+        let mut rng = chacha20::ChaCha8Rng::from_seed([1u8; 32]);
         let (our_pk, our_sk) = kem.generate_keypair(&mut rng);
         let kem = safe_oqs::kem::Kem::new(alg).unwrap();
         let opt_pk = kem.public_key_from_bytes(&our_pk.0);
@@ -269,7 +269,7 @@ mod tests {
         safe_oqs::kem::Algorithm::FrodoKem1344Shake
     )]
     fn encapsulate_compatibility<F: Kem>(#[case] kem: F, #[case] alg: safe_oqs::kem::Algorithm) {
-        let mut rng = rand_chacha::ChaCha8Rng::from_seed([1u8; 32]);
+        let mut rng = chacha20::ChaCha8Rng::from_seed([1u8; 32]);
         let (our_pk, our_sk) = kem.generate_keypair(&mut rng);
         let safe_kem = safe_oqs::kem::Kem::new(alg).unwrap();
 
@@ -315,7 +315,7 @@ mod tests {
         safe_oqs::kem::Algorithm::FrodoKem1344Shake
     )]
     fn decapsulate_compatibility<F: Kem>(#[case] kem: F, #[case] alg: safe_oqs::kem::Algorithm) {
-        let mut rng = rand_chacha::ChaCha8Rng::from_seed([1u8; 32]);
+        let mut rng = chacha20::ChaCha8Rng::from_seed([1u8; 32]);
         let (our_pk, our_sk) = kem.generate_keypair(&mut rng);
         let safe_kem = safe_oqs::kem::Kem::new(alg).unwrap();
 

frodo-kem/src/hazmat.rs

@@ -6,7 +6,7 @@
 //!
 //! ```
 //! use frodo_kem::Algorithm;
-//! use rand_core::{OsRng, TryRngCore};
+//! use rand::{rngs::OsRng, TryRngCore};
 //!
 //! let mut rng = OsRng.unwrap_err();
 //! let alg = Algorithm::FrodoKem640Shake;
@@ -28,7 +28,7 @@
 //!
 //! ```
 //! use frodo_kem::Algorithm;
-//! use rand_core::{RngCore, OsRng, TryRngCore};
+//! use rand::{rngs::OsRng, RngCore, TryRngCore};
 //!
 //! let mut rng = OsRng.unwrap_err();
 //! let alg = Algorithm::FrodoKem1344Shake;
@@ -1647,7 +1647,7 @@ mod tests {
         kem::Algorithm::FrodoKem1344Shake
     )]
     fn ephemeral_works(#[case] alg: Algorithm, #[case] safe_alg: kem::Algorithm) {
-        let mut rng = rand_chacha::ChaCha8Rng::from_seed([1u8; 32]);
+        let mut rng = chacha20::ChaCha8Rng::from_seed([1u8; 32]);
         let (our_pk, our_sk) = alg.generate_keypair(&mut rng);
         let kem = kem::Kem::new(safe_alg).unwrap();
 
@@ -1686,7 +1686,7 @@ mod tests {
     #[case::shake976(Algorithm::FrodoKem976Shake)]
     #[case::shake1344(Algorithm::FrodoKem1344Shake)]
     fn works(#[case] alg: Algorithm) {
-        let mut rng = rand_chacha::ChaCha8Rng::from_seed([1u8; 32]);
+        let mut rng = chacha20::ChaCha8Rng::from_seed([1u8; 32]);
         let (our_pk, our_sk) = alg.generate_keypair(&mut rng);
 
         let mut mu = vec![0u8; alg.params().message_length];
@@ -1716,7 +1716,7 @@ mod tests {
             #[case::shake976(Algorithm::EphemeralFrodoKem976Shake)]
             #[case::shake1344(Algorithm::EphemeralFrodoKem1344Shake)]
             fn $name(#[case] alg: Algorithm) {
-                let mut rng = rand_chacha::ChaCha8Rng::from_seed([3u8; 32]);
+                let mut rng = chacha20::ChaCha8Rng::from_seed([3u8; 32]);
                 let (pk, sk) = alg.generate_keypair(&mut rng);
                 let (ct, ss) = alg.encapsulate_with_rng(&pk, &mut rng).unwrap();
 

frodo-kem/src/lib.rs

@@ -24,23 +24,23 @@ pkcs8 = ["dep:const-oid", "dep:pkcs8"]
 zeroize = ["dep:zeroize"]
 
 [dependencies]
-kem = "=0.4.0-pre.1"
+kem = "=0.4.0-pre.2"
 hybrid-array = { version = "0.4.4", features = ["extra-sizes", "subtle"] }
-rand_core = "0.9"
-sha3 = { version = "0.11.0-rc.0", default-features = false }
+rand_core = "0.10.0-rc-2"
+sha3 = { version = "0.11.0-rc.3", default-features = false }
 subtle = { version = "2", default-features = false }
 
 # optional dependencies
 const-oid = { version = "0.10.1", optional = true, default-features = false, features = ["db"] }
-pkcs8 = { version = "0.11.0-rc.4", optional = true, default-features = false }
+pkcs8 = { version = "0.11.0-rc.8", optional = true, default-features = false }
 zeroize = { version = "1.8.1", optional = true, default-features = false }
 
 [dev-dependencies]
-criterion = "0.5.1"
+criterion = "0.7"
 hex = { version = "0.4.3", features = ["serde"] }
 hex-literal = "1"
 num-rational = { version = "0.4.2", default-features = false, features = ["num-bigint"] }
-rand = "0.9"
+rand = "0.10.0-rc.1"
 serde = { version = "1.0.208", features = ["derive"] }
 serde_json = "1.0.125"
 

ml-kem/Cargo.toml

@@ -13,23 +13,26 @@ keywords = ["crypto", "x-wing", "xwing", "kem", "post-quantum"]
 exclude = ["src/test-vectors.json"]
 
 [features]
-os_rng = ["rand_core/os_rng"]
+getrandom = ["dep:getrandom"]
 zeroize = ["dep:zeroize", "ml-kem/zeroize", "x25519-dalek/zeroize"]
 
 [dependencies]
-kem = "=0.4.0-pre.1"
+kem = "=0.4.0-pre.2"
 ml-kem = { version = "=0.3.0-pre.2", default-features = false, features = ["deterministic"] }
-rand_core = { version = "0.9.3", default-features = false }
-sha3 = { version = "0.11.0-rc.0", default-features = false }
-x25519-dalek = { version = "=3.0.0-pre.0", default-features = false, features = ["static_secrets"] }
+rand_core = { version = "0.10.0-rc-2", default-features = false }
+sha3 = { version = "0.11.0-rc.3", default-features = false }
+x25519-dalek = { version = "=3.0.0-pre.1", default-features = false, features = ["static_secrets"] }
+
+# optional dependencies
+getrandom = { version = "0.3", optional = true }
 zeroize = { version = "1.8.1", optional = true, default-features = true, features = ["zeroize_derive"] }
 
 [dev-dependencies]
-rand_core = { version = "0.9" }
+rand_core = { version = "0.10.0-rc-2" }
 hex = { version = "0.4", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-rand = "0.9"
+rand = "0.10.0-rc.1"
 
 [package.metadata.docs.rs]
 all-features = true