update dependencies rand

a-wing · a-wing · commit db749facd06c · 2025-07-19T01:29:45.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/dtls/Cargo.toml b/dtls/Cargo.toml
@@ -17,7 +17,7 @@ rand_core = "0.6"
 hkdf = "0.12"
 p256 = { version = "0.13", features = ["default", "ecdh", "ecdsa"] }
 p384 = "0.13"
-rand = "0.8"
+rand = "0.9"
 hmac = "0.12"
 sec1 = { version = "0.7", features = ["std"] }
 sha1 = "0.10"
diff --git a/dtls/src/conn/conn_test.rs b/dtls/src/conn/conn_test.rs
@@ -1793,7 +1793,7 @@ async fn test_server_timeout() -> Result<()> {
     .init();*/
 
     let mut cookie = vec![0u8; 20];
-    rand::thread_rng().fill(cookie.as_mut_slice());
+    rand::rng().fill(cookie.as_mut_slice());
 
     let random_bytes = [0u8; RANDOM_BYTES_LENGTH];
     let gmt_unix_time = SystemTime::UNIX_EPOCH
@@ -1951,7 +1951,7 @@ async fn test_protocol_version_validation() -> Result<()> {
     .init();*/
 
     let mut cookie = vec![0; 20];
-    rand::thread_rng().fill(cookie.as_mut_slice());
+    rand::rng().fill(cookie.as_mut_slice());
 
     let random_bytes = [0u8; RANDOM_BYTES_LENGTH];
     let gmt_unix_time = SystemTime::UNIX_EPOCH
@@ -2266,7 +2266,7 @@ async fn test_multiple_hello_verify_request() -> Result<()> {
     let mut packets = vec![];
     for i in 0..2 {
         let mut cookie = vec![0; 20];
-        rand::thread_rng().fill(cookie.as_mut_slice());
+        rand::rng().fill(cookie.as_mut_slice());
         cookies.push(cookie.clone());
 
         let mut handshake = Handshake::new(HandshakeMessage::HelloVerifyRequest(
diff --git a/dtls/src/crypto/crypto_cbc.rs b/dtls/src/crypto/crypto_cbc.rs
@@ -68,7 +68,7 @@ impl CryptoCbc {
         payload.extend_from_slice(&mac);
 
         let mut iv: Vec<u8> = vec![0; Self::BLOCK_SIZE];
-        rand::thread_rng().fill(iv.as_mut_slice());
+        rand::rng().fill(iv.as_mut_slice());
 
         let write_cbc = Aes256CbcEnc::new_from_slices(&self.local_key, &iv)?;
         let encrypted = write_cbc.encrypt_padded_vec_mut::<DtlsPadding>(&payload);
diff --git a/dtls/src/crypto/crypto_ccm.rs b/dtls/src/crypto/crypto_ccm.rs
@@ -109,7 +109,7 @@ impl CryptoCcm {
 
         let mut nonce = vec![0u8; CRYPTO_CCM_NONCE_LENGTH];
         nonce[..4].copy_from_slice(&self.local_write_iv[..4]);
-        rand::thread_rng().fill(&mut nonce[4..]);
+        rand::rng().fill(&mut nonce[4..]);
         let nonce = GenericArray::from_slice(&nonce);
 
         let additional_data = generate_aead_additional_data(pkt_rlh, payload.len());
diff --git a/dtls/src/crypto/crypto_gcm.rs b/dtls/src/crypto/crypto_gcm.rs
@@ -57,7 +57,7 @@ impl CryptoGcm {
 
         let mut nonce = vec![0u8; CRYPTO_GCM_NONCE_LENGTH];
         nonce[..4].copy_from_slice(&self.local_write_iv[..4]);
-        rand::thread_rng().fill(&mut nonce[4..]);
+        rand::rng().fill(&mut nonce[4..]);
         let nonce = GenericArray::from_slice(&nonce);
 
         let additional_data = generate_aead_additional_data(pkt_rlh, payload.len());
diff --git a/dtls/src/crypto/padding.rs b/dtls/src/crypto/padding.rs
@@ -60,7 +60,7 @@ pub mod tests {
         for original_length in 0..128 {
             for padding_length in 0..(256 - original_length) {
                 let mut block = vec![0; original_length + padding_length + 1];
-                rand::thread_rng().fill(&mut block[0..original_length]);
+                rand::rng().fill(&mut block[0..original_length]);
                 let original = block[0..original_length].to_vec();
                 DtlsPadding::raw_pad(&mut block, original_length);
 
diff --git a/dtls/src/flight/flight0.rs b/dtls/src/flight/flight0.rs
@@ -194,7 +194,7 @@ impl Flight for Flight0 {
     ) -> Result<Vec<Packet>, (Option<Alert>, Option<Error>)> {
         // Initialize
         state.cookie = vec![0; COOKIE_LENGTH];
-        rand::thread_rng().fill(state.cookie.as_mut_slice());
+        rand::rng().fill(state.cookie.as_mut_slice());
 
         //TODO: figure out difference between golang's atom store and rust atom store
         let zero_epoch = 0;
diff --git a/dtls/src/handshake/handshake_random.rs b/dtls/src/handshake/handshake_random.rs
@@ -66,6 +66,6 @@ impl HandshakeRandom {
     // may be called multiple times
     pub fn populate(&mut self) {
         self.gmt_unix_time = SystemTime::now();
-        rand::thread_rng().fill(&mut self.random_bytes);
+        rand::rng().fill(&mut self.random_bytes);
     }
 }
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -28,7 +28,7 @@ serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 bytes = "1"
 lazy_static = "1"
-rand = "0.8"
+rand = "0.9"
 
 memchr = "2.1.1"
 
diff --git a/ice/Cargo.toml b/ice/Cargo.toml
@@ -19,7 +19,7 @@ arc-swap = "1"
 async-trait = "0.1"
 crc = "3"
 log = "0.4"
-rand = "0.8"
+rand = "0.9"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 thiserror = "1"
diff --git a/ice/examples/ping_pong.rs b/ice/examples/ping_pong.rs
@@ -13,7 +13,7 @@ use ice::network_type::*;
 use ice::state::*;
 use ice::udp_network::UDPNetwork;
 use ice::Error;
-use rand::{thread_rng, Rng};
+use rand::{rng, Rng};
 use tokio::net::UdpSocket;
 use tokio::sync::{mpsc, watch, Mutex};
 use util::Conn;
@@ -327,7 +327,7 @@ async fn main() -> Result<(), Error> {
 
                 let val: String = (0..15)
                     .map(|_| {
-                        let idx = thread_rng().gen_range(0..RANDOM_STRING.len());
+                        let idx = rng().random_range(0..RANDOM_STRING.len());
                         RANDOM_STRING[idx] as char
                     })
                     .collect();
diff --git a/ice/src/rand/mod.rs b/ice/src/rand/mod.rs
@@ -1,7 +1,7 @@
 #[cfg(test)]
 mod rand_test;
 
-use rand::{thread_rng, Rng};
+use rand::{rng, Rng};
 
 const RUNES_ALPHA: &[u8] = b"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ";
 const RUNES_CANDIDATE_ID_FOUNDATION: &[u8] =
@@ -12,11 +12,11 @@ const LEN_PWD: usize = 32;
 
 // TODO: cryptographically strong random source
 pub fn generate_crypto_random_string(n: usize, runes: &[u8]) -> String {
-    let mut rng = thread_rng();
+    let mut rng = rng();
 
     let rand_string: String = (0..n)
         .map(|_| {
-            let idx = rng.gen_range(0..runes.len());
+            let idx = rng.random_range(0..runes.len());
             runes[idx] as char
         })
         .collect();
diff --git a/ice/src/udp_mux/udp_mux_test.rs b/ice/src/udp_mux/udp_mux_test.rs
@@ -2,7 +2,7 @@ use std::convert::TryInto;
 use std::io;
 use std::time::Duration;
 
-use rand::{thread_rng, Rng};
+use rand::{rng, Rng};
 use sha1::{Digest, Sha1};
 use stun::message::{Message, BINDING_REQUEST};
 use tokio::net::UdpSocket;
@@ -252,7 +252,7 @@ async fn test_mux_connection(
     let mut written = 0;
     let mut buffer = vec![0u8; RECEIVE_MTU];
     while written < TARGET_SIZE {
-        thread_rng().fill(&mut buffer[24..]);
+        rng().fill(&mut buffer[24..]);
 
         let hash = sha1_hash(&buffer[24..]);
         buffer[4..24].copy_from_slice(&hash);
diff --git a/interceptor/Cargo.toml b/interceptor/Cargo.toml
@@ -19,7 +19,7 @@ tokio = { version = "1.32.0", features = ["sync", "time"] }
 async-trait = "0.1"
 bytes = "1"
 thiserror = "1"
-rand = "0.8"
+rand = "0.9"
 waitgroup = "0.1"
 log = "0.4"
 portable-atomic = "1.6"
diff --git a/media/Cargo.toml b/media/Cargo.toml
@@ -15,7 +15,7 @@ rtp = { version = "0.13.0", path = "../rtp" }
 byteorder = "1"
 bytes = "1"
 thiserror = "1"
-rand = "0.8"
+rand = "0.9"
 
 [dev-dependencies]
 criterion = { version = "0.5", features = ["html_reports"] }
diff --git a/rtp/Cargo.toml b/rtp/Cargo.toml
@@ -13,7 +13,7 @@ repository = "https://github.com/webrtc-rs/webrtc/tree/master/rtp"
 util = { version = "0.11.0", path = "../util", package = "webrtc-util", default-features = false, features = ["marshal"] }
 
 bytes = "1"
-rand = "0.8"
+rand = "0.9"
 thiserror = "1"
 serde = { version = "1", features = ["derive"] }
 portable-atomic = "1.6"
diff --git a/sctp/Cargo.toml b/sctp/Cargo.toml
@@ -26,7 +26,7 @@ tokio = { version = "1.32.0", features = [
     "time",
 ] }
 bytes = "1"
-rand = "0.8"
+rand = "0.9"
 crc = "3.2.1"
 async-trait = "0.1"
 log = "0.4"
diff --git a/sctp/src/param/param_state_cookie.rs b/sctp/src/param/param_state_cookie.rs
@@ -56,7 +56,7 @@ impl ParamStateCookie {
     pub(crate) fn new() -> Self {
         let mut cookie = BytesMut::new();
         cookie.resize(32, 0);
-        rand::thread_rng().fill(cookie.as_mut());
+        rand::rng().fill(cookie.as_mut());
 
         ParamStateCookie {
             cookie: cookie.freeze(),
diff --git a/sdp/Cargo.toml b/sdp/Cargo.toml
@@ -11,7 +11,7 @@ repository = "https://github.com/webrtc-rs/webrtc/tree/master/sdp"
 
 [dependencies]
 url = "2"
-rand = "0.8"
+rand = "0.9"
 thiserror = "1"
 substring = "1"
 
diff --git a/stun/Cargo.toml b/stun/Cargo.toml
@@ -30,7 +30,7 @@ tokio = { version = "1.32.0", features = [
 ] }
 lazy_static = "1"
 url = "2"
-rand = "0.8"
+rand = "0.9"
 base64 = "0.22.1"
 subtle = "2.4"
 crc = "3"
diff --git a/stun/src/agent.rs b/stun/src/agent.rs
@@ -89,7 +89,7 @@ impl TransactionId {
     /// as source.
     pub fn new() -> Self {
         let mut b = TransactionId([0u8; TRANSACTION_ID_SIZE]);
-        rand::thread_rng().fill(&mut b.0);
+        rand::rng().fill(&mut b.0);
         b
     }
 }
diff --git a/stun/src/message.rs b/stun/src/message.rs
@@ -143,7 +143,7 @@ impl Message {
     // NewTransactionID sets m.TransactionID to random value from crypto/rand
     // and returns error if any.
     pub fn new_transaction_id(&mut self) -> Result<()> {
-        rand::thread_rng().fill(&mut self.transaction_id.0);
+        rand::rng().fill(&mut self.transaction_id.0);
         self.write_transaction_id();
         Ok(())
     }
diff --git a/turn/Cargo.toml b/turn/Cargo.toml
@@ -31,7 +31,7 @@ futures = "0.3"
 async-trait = "0.1"
 log = "0.4"
 base64 = "0.22.1"
-rand = "0.8"
+rand = "0.9"
 ring = "0.17.14"
 md-5 = "0.10"
 thiserror = "1"
diff --git a/turn/src/server/request.rs b/turn/src/server/request.rs
@@ -932,12 +932,9 @@ impl Request {
 }
 
 pub(crate) fn rand_seq(n: usize) -> String {
-    let letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ".as_bytes();
-    let mut buf = vec![0u8; n];
-    for b in &mut buf {
-        *b = letters[rand::random::<usize>() % letters.len()];
-    }
-    String::from_utf8(buf).unwrap_or_default()
+    use rand::distr::{Alphabetic, SampleString};
+
+    Alphabetic.sample_string(&mut rand::rng(), n)
 }
 
 pub(crate) fn build_nonce() -> Result<String> {
diff --git a/util/Cargo.toml b/util/Cargo.toml
@@ -35,7 +35,7 @@ lazy_static = "1"
 async-trait = "0.1"
 ipnet = "2.6.0"
 log = "0.4"
-rand = "0.8"
+rand = "0.9"
 bytes = "1"
 thiserror = "1"
 portable-atomic = "1.6"
diff --git a/webrtc/Cargo.toml b/webrtc/Cargo.toml
diff --git a/webrtc/src/peer_connection/mod.rs b/webrtc/src/peer_connection/mod.rs

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,6 @@ impl HandshakeRandom {`
`66`	`66`	`// may be called multiple times`
`67`	`67`	`pub fn populate(&mut self) {`
`68`	`68`	`self.gmt_unix_time = SystemTime::now();`
`69`		`- rand::thread_rng().fill(&mut self.random_bytes);`
	`69`	`+ rand::rng().fill(&mut self.random_bytes);`
`70`	`70`	`}`
`71`	`71`	`}`