chore: adapt to new rand interfaces

Author: coriolinus

e2e-identity/tests/utils/idp/authelia/mod.rs

@@ -2,7 +2,7 @@ use std::net::SocketAddr;
 
 use argon2::{
     Algorithm, Argon2, ParamsBuilder, Version,
-    password_hash::{PasswordHasher, SaltString, rand_core::OsRng},
+    password_hash::{PasswordHasher, SaltString},
 };
 use http::header;
 use oauth2::{CsrfToken, PkceCodeChallenge, RedirectUrl, Scope};

mls-provider/src/crypto_provider.rs

@@ -14,7 +14,7 @@ use openmls_traits::{
         HpkeKemType, SignatureScheme,
     },
 };
-use rand_core::{RngCore, SeedableRng};
+use rand::{SeedableRng as _, TryRngCore as _};
 use sha2::{Digest, Sha256, Sha384, Sha512};
 use signature::digest::typenum::Unsigned;
 use tls_codec::SecretVLBytes;
@@ -29,7 +29,7 @@ pub struct RustCrypto {
 impl Default for RustCrypto {
     fn default() -> Self {
         Self {
-            rng: Arc::new(rand_chacha::ChaCha20Rng::from_entropy().into()),
+            rng: Arc::new(rand_chacha::ChaCha20Rng::from_os_rng().into()),
         }
     }
 }
@@ -617,7 +617,7 @@ mod hpke_core {
         info: &[u8],
         aad: &[u8],
         plaintext: &[u8],
-        csprng: &mut impl rand_core::CryptoRngCore,
+        csprng: &mut impl rand::CryptoRng,
     ) -> Result<HpkeCiphertext, CryptoError> {
         use hpke::{Deserializable as _, Serializable as _};
         let key = Kem::PublicKey::from_bytes(public_key).map_err(|_| CryptoError::HpkeEncryptionError)?;
@@ -633,7 +633,7 @@ mod hpke_core {
 
     #[allow(dead_code)]
     pub(crate) fn hpke_gen_keypair<Kem: hpke::Kem>(
-        csprng: &mut impl rand_core::CryptoRngCore,
+        csprng: &mut impl rand::CryptoRng,
     ) -> Result<HpkeKeyPair, CryptoError> {
         use hpke::Serializable as _;
         let (sk, pk) = Kem::gen_keypair(csprng);
@@ -676,7 +676,7 @@ mod hpke_core {
         info: &[u8],
         export_info: &[u8],
         export_len: usize,
-        csprng: &mut impl rand_core::CryptoRngCore,
+        csprng: &mut impl rand::CryptoRng,
     ) -> Result<(Vec<u8>, Vec<u8>), CryptoError> {
         use hpke::{Deserializable as _, Serializable as _};
         let key = Kem::PublicKey::from_bytes(tx_public_key).map_err(|_| CryptoError::SenderSetupError)?;

mls-provider/src/lib.rs

@@ -17,10 +17,6 @@ use openmls_traits::{
 };
 pub use pki::{CertProfile, CertificateGenerationArgs, PkiEnvironmentProvider, PkiKeypair};
 
-pub mod reexports {
-    pub use rand_core;
-}
-
 /// 32-byte raw entropy seed
 pub type RawEntropySeed = <rand_chacha::ChaCha20Rng as rand::SeedableRng>::Seed;
 

obfuscate/src/lib.rs

@@ -18,7 +18,7 @@ pub fn compute_hash(bytes: &[u8]) -> [u8; 10] {
     static SALT: LazyLock<[u8; 32]> = LazyLock::new(|| {
         use rand::Rng as _;
         let mut salt = [0; _];
-        rand::thread_rng().fill(&mut salt);
+        rand::rng().fill(&mut salt);
         salt
     });