deps(rand): update rand and rand_core to 0.10

Author: robinhundt

Cargo.lock

@@ -33,8 +33,8 @@ hybrid-array = { version = "0.4.7", features = ["bytemuck"] }
 libc = "0.2.169"
 ndarray = "0.17.2"
 num-traits = "0.2.19"
-rand = "0.9.0"
-rand_core = "0.9.0"
+rand = "0.10.0"
+rand_core = "0.10.0"
 rand_core_0_6 = { package = "rand_core", version = "0.6" }
 rayon = "1.10.0"
 s2n-quic = "1.37.0"

Cargo.toml

@@ -2,7 +2,7 @@ use bytemuck::cast_slice_mut;
 use criterion::{Criterion, criterion_group, criterion_main};
 use cryprot_codes::ex_conv::ExConvCode;
 use cryprot_core::{Block, buf::Buf};
-use rand::{RngCore, rng};
+use rand::{Rng, rng};
 
 fn criterion_benchmark(c: &mut Criterion) {
     {

cryprot-codes/benches/bench.rs

@@ -286,7 +286,7 @@ mod tests {
     use bytemuck::cast_slice_mut;
     use cryprot_core::block::Block;
     #[cfg(feature = "libote-compat")]
-    use rand::{RngCore, SeedableRng, rngs::StdRng};
+    use rand::{Rng, SeedableRng, rngs::StdRng};
 
     use super::*;
 

cryprot-codes/src/ex_conv.rs

@@ -129,7 +129,7 @@ impl ExpanderCode {
 #[cfg(test)]
 mod tests {
     use bytemuck::cast_slice_mut;
-    use rand::{RngCore, SeedableRng, rngs::StdRng};
+    use rand::{Rng, SeedableRng, rngs::StdRng};
 
     use super::*;
 

cryprot-codes/src/ex_conv/expander.rs

@@ -95,7 +95,7 @@ impl ExpanderModd {
 
 #[cfg(test)]
 mod tests {
-    use rand::{Rng, SeedableRng, rngs::StdRng};
+    use rand::{RngExt, SeedableRng, rngs::StdRng};
 
     use super::*;
 

cryprot-codes/src/ex_conv/expander_modd.rs

@@ -1,6 +1,6 @@
 use bytemuck::{cast_mut, cast_ref, cast_slice, cast_slice_mut};
 use cryprot_core::{Block, aes_rng::AesRng};
-use rand::{RngCore, SeedableRng};
+use rand::{Rng, SeedableRng};
 
 // Simple PRNG implementation for the accumulator
 pub(crate) struct FastAesRng {

cryprot-codes/src/ex_conv/fast_aes_rng.rs

@@ -6,7 +6,7 @@ use cryprot_core::{
     buf::Buf,
     transpose::{avx2, portable},
 };
-use rand::{RngCore, rng};
+use rand::{Rng, rng};
 
 fn criterion_benchmark(c: &mut Criterion) {
     let rows = 128;

cryprot-core/benches/bench.rs

@@ -15,8 +15,11 @@ use aes::{
     Aes128,
     cipher::{BlockCipherEncrypt, KeyInit},
 };
-use rand::{CryptoRng, Rng, RngCore, SeedableRng};
-use rand_core::block::{BlockRng, BlockRngCore, CryptoBlockRng};
+use rand::{RngExt, SeedableRng};
+use rand_core::{
+    TryCryptoRng, TryRng,
+    block::{BlockRng, Generator},
+};
 
 use crate::{AES_PAR_BLOCKS, Block};
 
@@ -28,23 +31,25 @@ use crate::{AES_PAR_BLOCKS, Block};
 #[derive(Clone, Debug)]
 pub struct AesRng(BlockRng<AesRngCore>);
 
-impl RngCore for AesRng {
+impl TryRng for AesRng {
+    type Error = core::convert::Infallible;
+
     #[inline]
-    fn next_u32(&mut self) -> u32 {
-        self.0.next_u32()
+    fn try_next_u32(&mut self) -> Result<u32, Self::Error> {
+        Ok(self.0.next_word())
     }
 
     #[inline]
-    fn next_u64(&mut self) -> u64 {
-        self.0.next_u64()
+    fn try_next_u64(&mut self) -> Result<u64, Self::Error> {
+        Ok(self.0.next_u64_from_u32())
     }
 
     #[inline]
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Self::Error> {
         let block_size = mem::size_of::<aes::Block>();
         let block_len = dest.len() / block_size * block_size;
         let (block_bytes, rest_bytes) = dest.split_at_mut(block_len);
-        // fast path so we don't unnecessarily copy u32 from BlockRngCore::generate into
+        // fast path so we don't unnecessarily copy u32 from Generator::generate into
         // dest
         let blocks = bytemuck::cast_slice_mut::<_, aes::Block>(block_bytes);
         for chunk in blocks.chunks_mut(AES_PAR_BLOCKS) {
@@ -55,7 +60,8 @@ impl RngCore for AesRng {
             self.0.core.aes.encrypt_blocks(chunk);
         }
         // handle the tail
-        self.0.fill_bytes(rest_bytes)
+        self.0.fill_bytes(rest_bytes);
+        Ok(())
     }
 }
 
@@ -64,11 +70,11 @@ impl SeedableRng for AesRng {
 
     #[inline]
     fn from_seed(seed: Self::Seed) -> Self {
-        AesRng(BlockRng::<AesRngCore>::from_seed(seed))
+        AesRng(BlockRng::new(AesRngCore::from_seed(seed)))
     }
 }
 
-impl CryptoRng for AesRng {}
+impl TryCryptoRng for AesRng {}
 
 impl AesRng {
     /// Create a new random number generator using a random seed from
@@ -107,15 +113,14 @@ impl std::fmt::Debug for AesRngCore {
     }
 }
 
-impl BlockRngCore for AesRngCore {
-    type Item = u32;
-    // This is equivalent to `[Block; 9]`
-    type Results = hidden::ParBlockWrapper;
+impl Generator for AesRngCore {
+    // This is equivalent to `[aes::Block; AES_PAR_BLOCKS]`
+    type Output = [u32; AES_PAR_BLOCKS * std::mem::size_of::<u32>()];
 
     // Compute `E(state)` nine times, where `state` is a counter.
     #[inline]
-    fn generate(&mut self, results: &mut Self::Results) {
-        let blocks = bytemuck::cast_slice_mut::<_, aes::Block>(results.as_mut());
+    fn generate(&mut self, results: &mut Self::Output) {
+        let blocks = bytemuck::cast_slice_mut::<_, aes::Block>(results);
         blocks.iter_mut().for_each(|blk| {
             // aes::Block is a type alias to Array, but type aliases can't be used as
             // constructors
@@ -126,32 +131,6 @@ impl BlockRngCore for AesRngCore {
     }
 }
 
-mod hidden {
-    /// Equivalent to [aes::Block; 9] (which is the parralel block size for the
-    /// aes-ni backend). Since size 36 arrays don't impl Default we write a
-    /// wrapper.
-    #[derive(Copy, Clone)]
-    pub struct ParBlockWrapper([u32; 36]);
-
-    impl Default for ParBlockWrapper {
-        fn default() -> Self {
-            Self([0; 36])
-        }
-    }
-
-    impl AsMut<[u32]> for ParBlockWrapper {
-        fn as_mut(&mut self) -> &mut [u32] {
-            &mut self.0
-        }
-    }
-
-    impl AsRef<[u32]> for ParBlockWrapper {
-        fn as_ref(&self) -> &[u32] {
-            &self.0
-        }
-    }
-}
-
 impl SeedableRng for AesRngCore {
     type Seed = Block;
 
@@ -165,8 +144,6 @@ impl SeedableRng for AesRngCore {
     }
 }
 
-impl CryptoBlockRng for AesRngCore {}
-
 impl From<AesRngCore> for AesRng {
     #[inline]
     fn from(core: AesRngCore) -> Self {

cryprot-core/src/aes_rng.rs

@@ -224,7 +224,7 @@ mod clmul {
 
         use std::{hint::black_box, mem::transmute};
 
-        use rand::{Rng, rng};
+        use rand::{RngExt, rng};
         use test::Bencher;
 
         #[bench]
@@ -443,7 +443,7 @@ mod scalar {
         extern crate test;
 
         use criterion::black_box;
-        use rand::{Rng, rng};
+        use rand::{RngExt, rng};
         use test::Bencher;
 
         #[bench]
@@ -466,7 +466,7 @@ mod scalar {
 mod scalar_simd_tests {
     use std::mem::transmute;
 
-    use rand::{Rng, rng};
+    use rand::{RngExt, rng};
 
     use super::{clmul, scalar};