Bump rand_core to v0.10.0-rc-2

Also migrates from `rand_chacha` to `chacha20` for an RNG

Author: tarcieri

Cargo.lock

@@ -23,21 +23,21 @@ subtle = { version = "2.6", default-features = false }
 der = { version = "0.8.0-rc.9", optional = true, default-features = false }
 hybrid-array = { version = "0.4.5", optional = true, features = ["subtle"] }
 num-traits = { version = "0.2.19", default-features = false }
-rand_core = { version = "0.9.2", optional = true, default-features = false }
+rand_core = { version = "0.10.0-rc-2", optional = true, default-features = false }
 rlp = { version = "0.6", optional = true, default-features = false }
 serdect = { version = "0.4", optional = true, default-features = false }
 zeroize = { version = "1", optional = true, default-features = false }
 
 [dev-dependencies]
 bincode = { version = "2", features = ["serde"] }
+chacha20 = { version = "0.10.0-rc.3", default-features = false, features = ["rng"] }
 criterion = { version = "0.7", features = ["html_reports"] }
 hex-literal = "1"
 num-bigint = "0.4"
 num-integer = "0.1"
 num-modular = { version = "0.6", features = ["num-bigint", "num-integer", "num-traits"] }
 proptest = "1.9"
-rand_core = { version = "0.9", features = ["std", "os_rng"] }
-rand_chacha = "0.9"
+rand_core = "0.10.0-rc-2"
 
 [features]
 default = ["rand"]

Cargo.toml

@@ -456,12 +456,17 @@ mod tests {
     #[cfg(feature = "rand_core")]
     use {
         crate::{I1024, Random, U512, U1024},
-        rand_chacha::ChaChaRng,
+        chacha20::ChaCha8Rng,
         rand_core::SeedableRng,
     };
 
     use crate::{I128, U128};
 
+    const SEED: [u8; 32] = [
+        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+        25, 26, 27, 28, 29, 30, 31,
+    ];
+
     #[test]
     fn test_div_uint() {
         // lhs = min
@@ -488,10 +493,11 @@ mod tests {
         assert_eq!(I128::MAX / U128::MAX.to_nz().unwrap(), I128::ZERO);
     }
 
+    // TODO(tarcieri): use proptest
     #[cfg(feature = "rand_core")]
     #[test]
     fn test_div_ct_vs_vt() {
-        let mut rng = ChaChaRng::from_os_rng();
+        let mut rng = ChaCha8Rng::from_seed(SEED);
         for _ in 0..50 {
             let num = I1024::random(&mut rng);
             let denom = U1024::from(&U512::random(&mut rng)).to_nz().unwrap();
@@ -556,10 +562,11 @@ mod tests {
         );
     }
 
+    // TODO(tarcieri): use proptest
     #[cfg(feature = "rand_core")]
     #[test]
     fn test_div_floor_ct_vs_vt() {
-        let mut rng = ChaChaRng::from_os_rng();
+        let mut rng = ChaCha8Rng::from_seed(SEED);
         for _ in 0..50 {
             let num = I1024::random(&mut rng);
             let denom = U1024::from(&U512::random(&mut rng)).to_nz().unwrap();

src/int/div_uint.rs

@@ -119,7 +119,7 @@
 //! ```
 //! # #[cfg(feature = "rand")]
 //! # {
-//! # use rand_chacha::ChaCha8Rng;
+//! # use chacha20::ChaCha8Rng;
 //! # use rand_core::SeedableRng;
 //! # fn rng() -> ChaCha8Rng {
 //! #     ChaCha8Rng::from_seed(*b"01234567890123456789012345678901")
@@ -138,7 +138,7 @@
 //! ```
 //! # #[cfg(feature = "rand")]
 //! # {
-//! # use rand_chacha::ChaCha8Rng;
+//! # use chacha20::ChaCha8Rng;
 //! # use rand_core::SeedableRng;
 //! # fn rng() -> ChaCha8Rng {
 //! #     ChaCha8Rng::from_seed(*b"01234567890123456789012345678901")

src/lib.rs

@@ -38,7 +38,7 @@ mod tests {
 
         const SIZE: u32 = 511;
 
-        let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(1);
+        let mut rng = chacha20::ChaCha8Rng::seed_from_u64(1);
         for n in 0..100 {
             let modulus = Odd::<BoxedUint>::random(&mut rng, SIZE);
             let params = BoxedMontyParams::new(modulus.clone());

src/modular/boxed_monty_form/lincomb.rs

@@ -35,7 +35,7 @@ mod tests {
         );
         let modulus = P::PARAMS.modulus.as_nz_ref();
 
-        let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(1);
+        let mut rng = chacha20::ChaCha8Rng::seed_from_u64(1);
         for n in 0..1000 {
             let a = U256::random_mod(&mut rng, modulus);
             let b = U256::random_mod(&mut rng, modulus);

src/modular/const_monty_form/lincomb.rs

@@ -38,7 +38,7 @@ mod tests {
         };
         use rand_core::SeedableRng;
 
-        let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(1);
+        let mut rng = chacha20::ChaCha8Rng::seed_from_u64(1);
         for n in 0..1500 {
             let modulus = Odd::<U256>::random(&mut rng);
             let params = MontyParams::new_vartime(modulus);

src/modular/monty_form/lincomb.rs

@@ -84,7 +84,7 @@ mod tests {
         ($size:expr, $test_name:ident) => {
             #[test]
             fn $test_name() {
-                let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(1);
+                let mut rng = chacha20::ChaCha8Rng::seed_from_u64(1);
                 let moduli = [
                     NonZero::<Limb>::random(&mut rng),
                     NonZero::<Limb>::random(&mut rng),

src/uint/add_mod.rs

@@ -589,7 +589,7 @@ mod tests {
     fn encode_radix_round_trip() {
         use crate::RandomBits;
         use rand_core::SeedableRng;
-        let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(1);
+        let mut rng = chacha20::ChaCha8Rng::seed_from_u64(1);
 
         for _ in 0..100 {
             let uint = BoxedUint::random_bits(&mut rng, 4096);

src/uint/boxed/encoding.rs

@@ -221,7 +221,7 @@ mod tests {
     fn mul_cmp() {
         use crate::{RandomBits, Resize};
         use rand_core::SeedableRng;
-        let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(1);
+        let mut rng = chacha20::ChaCha8Rng::seed_from_u64(1);
 
         for i in 0..50 {
             let a = BoxedUint::random_bits(&mut rng, 4096);