Update direct rand deps to 0.9.4 in our crates

app_native/Cargo.toml

@@ -8,7 +8,7 @@ authors = ["Ardalan Amiri Sani <[email protected]>"]
 secluso-client-lib = { path = "../client_lib" }
 secluso-client-server-lib = { path = "../client_server_lib" }
 bincode = "1.3.3"
-rand="0.8"
+rand = "0.9.4"
 lazy_static = "1.5"
 serde_json="1.0.149"
 log = { version="0.4.29", features=["kv"] }

app_native/src/lib.rs

@@ -5,6 +5,7 @@
 use anyhow::anyhow;
 use anyhow::Context;
 use log::{debug, error, info};
+use rand::distr::Alphanumeric;
 use rand::Rng;
 use secluso_client_lib::config::{
     Heartbeat, HeartbeatRequest, HeartbeatResult, OPCODE_HEARTBEAT_REQUEST, OPCODE_HEARTBEAT_RESPONSE,
@@ -79,9 +80,9 @@ impl Clients {
 
 fn get_app_name(first_time: bool, file_dir: String, filename: String) -> String {
     let app_name = if first_time {
-        let mut rng = rand::thread_rng();
+        let mut rng = rand::rng();
         let aname: String = (0..NUM_RANDOM_CHARS)
-            .map(|_| rng.sample(rand::distributions::Alphanumeric) as char)
+            .map(|_| rng.sample(Alphanumeric) as char)
             .collect();
 
         let mut file =

camera_hub/Cargo.toml

@@ -19,7 +19,7 @@ env_logger = "0.11.9"
 log = { version = "0.4.29", optional = true }
 serde = "1.0"
 serde_derive = "1.0"
-rand="0.8"
+rand = "0.9.4"
 bincode = "1.2.1"
 secluso-client-lib = { path = "../client_lib", features = ["http_client"] }
 secluso-client-server-lib = { path = "../client_server_lib" }

camera_hub/src/pairing.rs

@@ -873,9 +873,9 @@ pub fn get_names(
     let group_path = state_dir_path.join(group_filename);
 
     let (camera_name, group_name) = if first_time {
-        let mut rng = rand::thread_rng();
+        let mut rng = rand::rng();
         let cname: String = (0..NUM_RANDOM_CHARS)
-            .map(|_| rng.sample(rand::distributions::Alphanumeric) as char)
+            .map(|_| rng.sample(rand::distr::Alphanumeric) as char)
             .collect();
 
         let mut file = File::create(camera_path).expect("Could not create file");
@@ -884,7 +884,7 @@ pub fn get_names(
         file.sync_all().unwrap();
 
         let gname: String = (0..NUM_RANDOM_CHARS)
-            .map(|_| rng.sample(rand::distributions::Alphanumeric) as char)
+            .map(|_| rng.sample(rand::distr::Alphanumeric) as char)
             .collect();
 
         file = File::create(group_path).expect("Could not create file");

camera_hub/src/test_camera.rs

@@ -28,8 +28,8 @@ impl Camera for TestCamera {
     fn record_motion_video(&self, info: &VideoInfo, _duration: u64) -> io::Result<()> {
         let mut file = File::create(self.video_dir.clone() + "/" + &info.filename)?;
 
-        let mut rng = rand::thread_rng();
-        let data: Vec<u8> = (0..1024).map(|_| rng.gen()).collect();
+        let mut rng = rand::rng();
+        let data: Vec<u8> = (0..1024).map(|_| rng.random()).collect();
 
         file.write_all(&data)?;
 
@@ -105,4 +105,4 @@ impl Camera for TestCamera {
     fn get_thumbnail_dir(&self) -> String {
         self.thumbnail_dir.clone()
     }
-}
+}

client_lib/Cargo.toml

@@ -26,6 +26,6 @@ base64 = { version = "0.22.1", optional = true }
 base64-url = {version = "3.0.3"}
 anyhow = "^1.0.64" # Locked to this version due to flutter_rust_bridge usage in app
 serde_json = "1.0.149"
-rand = "0.8"
+rand = "0.9.4"
 qrcode = { version = "0.14.1", optional = true }
 image = { version = "0.25.10", optional = true }

client_lib/src/pairing.rs

@@ -13,8 +13,8 @@ use std::path::Path;
 use openmls_rust_crypto::OpenMlsRustCrypto;
 use openmls_traits::random::OpenMlsRand;
 use openmls_traits::OpenMlsProvider;
-use rand::distributions::Uniform;
-use rand::{thread_rng, Rng};
+use rand::distr::Uniform;
+use rand::Rng;
 
 pub const NUM_SECRET_BYTES: usize = 72;
 pub const CAMERA_SECRET_VERSION: &str = "v1.2";
@@ -132,10 +132,10 @@ pub fn generate_random(num_chars: usize, special_characters: bool) -> String {
                            0123456789"
     };
 
-    let mut rng = thread_rng();
+    let mut rng = rand::rng();
     (0..num_chars)
         .map(|_| {
-            let idx = rng.sample(Uniform::new(0, charset.len()));
+            let idx = rng.sample(Uniform::new(0, charset.len()).unwrap());
             charset[idx] as char
         })
         .collect()

client_server_lib/Cargo.toml

@@ -6,6 +6,6 @@ authors = ["Ardalan Amiri Sani <[email protected]>"]
 
 [dependencies]
 anyhow = "^1.0.64" # Locked to this version due to flutter_rust_bridge usage in app
-rand = "0.8"
+rand = "0.9.4"
 serde = "1.0"
 serde_json = { version = "1.0" }

client_server_lib/src/auth.rs

@@ -3,8 +3,8 @@
 //! SPDX-License-Identifier: GPL-3.0-or-later
 
 use anyhow::Context;
-use rand::distributions::Uniform;
-use rand::{thread_rng, Rng};
+use rand::distr::Uniform;
+use rand::Rng;
 use std::io;
 
 pub const NUM_USERNAME_CHARS: usize = 14;
@@ -77,10 +77,10 @@ pub fn generate_random(num_chars: usize, special_characters: bool) -> String {
                            0123456789"
     };
 
-    let mut rng = thread_rng();
+    let mut rng = rand::rng();
     (0..num_chars)
         .map(|_| {
-            let idx = rng.sample(Uniform::new(0, charset.len()));
+            let idx = rng.sample(Uniform::new(0, charset.len()).unwrap());
             charset[idx] as char
         })
         .collect()