build(deps): update rand to v0.10 (#2987)

Author: boquan-fang

dc/s2n-quic-dc/Cargo.toml

@@ -43,10 +43,9 @@ libc = "0.2"
 num-rational = { version = "0.4", default-features = false }
 once_cell = "1"
 pin-project-lite = "0.2"
-rand = { version = "0.9", features = ["small_rng"] }
-rand_chacha = "0.9"
+rand = "0.10"
 s2n-codec = { version = "=0.75.0", path = "../../common/s2n-codec", default-features = false }
-s2n-quic = { version = "=1.75.0", path = "../../quic/s2n-quic", features = ["unstable-provider-dc"] }
+s2n-quic = { version = "=1.75.0", path = "../../quic/s2n-quic", features = ["unstable-provider-dc", "unstable-provider-random"] }
 s2n-quic-core = { version = "=0.75.0", path = "../../quic/s2n-quic-core", default-features = false }
 s2n-quic-platform = { version = "=0.75.0", path = "../../quic/s2n-quic-platform" }
 s2n-tls = "0.3"

dc/s2n-quic-dc/src/path/secret/map/cleaner.rs

@@ -6,7 +6,7 @@ use crate::{
     event::{self, EndpointPublisher as _},
     path::secret::map::store::Store,
 };
-use rand::Rng as _;
+use rand::RngExt as _;
 use s2n_quic_core::time;
 use std::{
     sync::{

dc/s2n-quic-dc/src/path/secret/receiver/tests.rs

@@ -4,7 +4,7 @@
 use super::*;
 use crate::credentials::Id;
 use bolero::{check, ValueGenerator};
-use rand::{seq::SliceRandom, Rng, SeedableRng};
+use rand::{seq::SliceRandom, RngExt, SeedableRng};
 use std::collections::{binary_heap::PeekMut, BinaryHeap, HashSet};
 
 #[test]

dc/s2n-quic-dc/src/psk/io.rs

@@ -4,7 +4,7 @@
 use super::{client, server};
 use crate::path::secret;
 use cfg_if::cfg_if;
-use rand::Rng;
+use rand::RngExt;
 use s2n_quic::{
     provider::{
         dc::{ConfirmComplete, MtuConfirmComplete},

dc/s2n-quic-dc/src/random.rs

@@ -1,70 +1,53 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
-use rand::{rngs::ReseedingRng, RngCore};
-use rand_chacha::ChaChaCore;
+use rand::rand_core::TryRng;
 
 pub use s2n_quic_core::random::*;
 
 struct AwsLc;
 
-impl RngCore for AwsLc {
+impl TryRng for AwsLc {
+    type Error = core::convert::Infallible;
+
     #[inline]
-    fn next_u32(&mut self) -> u32 {
+    fn try_next_u32(&mut self) -> Result<u32, Self::Error> {
         let mut v = [0; 4];
-        self.fill_bytes(&mut v);
-        u32::from_ne_bytes(v)
+        aws_lc_rs::rand::fill(&mut v).unwrap();
+        Ok(u32::from_ne_bytes(v))
     }
 
     #[inline]
-    fn next_u64(&mut self) -> u64 {
+    fn try_next_u64(&mut self) -> Result<u64, Self::Error> {
         let mut v = [0; 8];
-        self.fill_bytes(&mut v);
-        u64::from_ne_bytes(v)
+        aws_lc_rs::rand::fill(&mut v).unwrap();
+        Ok(u64::from_ne_bytes(v))
     }
 
     #[inline]
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        aws_lc_rs::rand::fill(dest).unwrap()
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Self::Error> {
+        aws_lc_rs::rand::fill(dest).unwrap();
+        Ok(())
     }
 }
 
-pub struct Random {
-    public: ReseedingRng<ChaChaCore, AwsLc>,
-    private: ReseedingRng<ChaChaCore, AwsLc>,
-}
+pub struct Random(s2n_quic::provider::random::Random<AwsLc>);
 
 impl Default for Random {
     #[inline]
     fn default() -> Self {
-        Self {
-            public: build_rng(),
-            private: build_rng(),
-        }
+        Self(s2n_quic::provider::random::Random::new(AwsLc, AwsLc))
     }
 }
 
-// Constructs a `ReseedingRng` with a ChaCha RNG initially seeded from the OS,
-// that will reseed from the OS after RESEED_THRESHOLD is exceeded
-fn build_rng() -> ReseedingRng<ChaChaCore, AwsLc> {
-    // Number of generated bytes after which to reseed the public and private random
-    // generators.
-    //
-    // This value is based on THREAD_RNG_RESEED_THRESHOLD from
-    // [rand::rngs::thread.rs](https://github.com/rust-random/rand/blob/ef75e56cf5824d33c55622bf84a70ec6e22761ba/src/rngs/thread.rs#L39)
-    const RESEED_THRESHOLD: u64 = 1024 * 64;
-    ReseedingRng::<ChaChaCore, AwsLc>::new(RESEED_THRESHOLD, AwsLc)
-        .unwrap_or_else(|err| panic!("could not initialize random generator: {err}"))
-}
-
 impl Generator for Random {
     #[inline]
     fn public_random_fill(&mut self, dest: &mut [u8]) {
-        self.public.fill_bytes(dest);
+        self.0.public_random_fill(dest);
     }
 
     #[inline]
     fn private_random_fill(&mut self, dest: &mut [u8]) {
-        self.private.fill_bytes(dest);
+        self.0.private_random_fill(dest);
     }
 }

quic/s2n-quic-qns/Cargo.toml

@@ -22,7 +22,7 @@ futures = "0.3"
 http = "1.0"
 humansize = "2"
 lru = "0.16"
-rand = "0.9"
+rand = "0.10"
 s2n-codec = { path = "../../common/s2n-codec" }
 s2n-quic-core = { path = "../s2n-quic-core", features = ["testing"] }
 s2n-quic-h3 = { path = "../s2n-quic-h3" }

quic/s2n-quic-qns/src/intercept.rs

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use lru::LruCache;
-use rand::{Rng as _, RngCore};
+use rand::Rng as _;
 use s2n_codec::encoder::scatter;
 use s2n_quic_core::{
     event::api::Subject,
@@ -43,7 +43,7 @@ impl havoc::Random for Random {
             return start;
         }
 
-        rand::rng().random_range(start..end)
+        rand::random_range(start..end)
     }
 }
 

quic/s2n-quic-sim/Cargo.toml

@@ -18,7 +18,7 @@ indicatif = { version = "0.18", features = ["rayon"] }
 jiff = "0.2"
 once_cell = "1"
 prost = "0.14"
-rand = "0.9"
+rand = "0.10"
 rayon = "1"
 s2n-quic = { path = "../s2n-quic", features = ["unstable-provider-io-testing", "provider-event-tracing"] }
 s2n-quic-core = { path = "../s2n-quic-core", features = ["testing"] }

quic/s2n-quic-tests/Cargo.toml

@@ -14,8 +14,7 @@ publish = false
 bach = "0.1.0"
 bytes = { version = "1", default-features = false }
 futures = { version = "0.3", default-features = false, features = ["std"] }
-rand = "0.9"
-rand_chacha = "0.9"
+rand = { version = "0.10", features = ["chacha"] }
 s2n-codec = { path = "../../common/s2n-codec" }
 s2n-quic-core = { path = "../s2n-quic-core", features = ["branch-tracing", "event-tracing", "probe-tracing", "testing"] }
 s2n-quic = { path = "../s2n-quic", features = ["provider-event-tracing", "unstable-provider-io-testing", "unstable-provider-dc", "unstable-provider-packet-interceptor", "unstable-provider-random", "unstable-offload-tls"] }

quic/s2n-quic-tests/src/lib.rs

@@ -1,6 +1,11 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
 
+use rand::{
+    rand_core::{Rng, SeedableRng, TryRng},
+    rngs::ChaCha8Rng,
+    RngExt,
+};
 use s2n_quic::{
     client::Connect,
     provider::{
@@ -11,8 +16,6 @@ use s2n_quic::{
     Client, Server,
 };
 use s2n_quic_core::{crypto::tls::testing::certificates, havoc, stream::testing::Data};
-
-use rand::{Rng, RngCore};
 use std::net::SocketAddr;
 
 pub mod recorder;
@@ -281,39 +284,41 @@ pub fn build_client(handle: &Handle, network_env: Model, with_blocklist: bool) -
 }
 
 pub struct Random {
-    inner: rand_chacha::ChaCha8Rng,
+    inner: ChaCha8Rng,
 }
 
 impl Random {
     pub fn with_seed(seed: u64) -> Self {
-        use rand::SeedableRng;
         Self {
-            inner: rand_chacha::ChaCha8Rng::seed_from_u64(seed),
+            inner: ChaCha8Rng::seed_from_u64(seed),
         }
     }
 }
 
 impl havoc::Random for Random {
     fn fill(&mut self, bytes: &mut [u8]) {
-        self.fill_bytes(bytes);
+        Rng::fill_bytes(&mut self.inner, bytes);
     }
 
     fn gen_range(&mut self, range: std::ops::Range<u64>) -> u64 {
         self.inner.random_range(range)
     }
 }
 
-impl RngCore for Random {
-    fn fill_bytes(&mut self, dest: &mut [u8]) {
-        self.inner.fill_bytes(dest)
+impl TryRng for Random {
+    type Error = core::convert::Infallible;
+
+    fn try_next_u32(&mut self) -> Result<u32, Self::Error> {
+        Ok(Rng::next_u32(&mut self.inner))
     }
 
-    fn next_u32(&mut self) -> u32 {
-        self.inner.next_u32()
+    fn try_next_u64(&mut self) -> Result<u64, Self::Error> {
+        Ok(Rng::next_u64(&mut self.inner))
     }
 
-    fn next_u64(&mut self) -> u64 {
-        self.inner.next_u64()
+    fn try_fill_bytes(&mut self, dest: &mut [u8]) -> Result<(), Self::Error> {
+        Rng::fill_bytes(&mut self.inner, dest);
+        Ok(())
     }
 }
 
@@ -329,11 +334,11 @@ impl s2n_quic::provider::random::Provider for Random {
 
 impl s2n_quic::provider::random::Generator for Random {
     fn public_random_fill(&mut self, dest: &mut [u8]) {
-        self.fill_bytes(dest);
+        Rng::fill_bytes(self, dest);
     }
 
     fn private_random_fill(&mut self, dest: &mut [u8]) {
-        self.fill_bytes(dest);
+        Rng::fill_bytes(self, dest);
     }
 }