Bump rand_core to 0.10.0-rc.2 (#600)

Author: baloo

Cargo.lock

@@ -14,11 +14,11 @@ rust-version = "1.85"
 
 [dependencies]
 const-oid = { version = "0.10", default-features = false }
-crypto-bigint = { version = "0.7.0-rc.8", default-features = false, features = ["zeroize", "alloc"] }
+crypto-bigint = { version = "0.7.0-rc.10", default-features = false, features = ["zeroize", "alloc"] }
 crypto-primes = { version = "0.7.0-pre.2", default-features = false }
 digest = { version = "0.11.0-rc.1", default-features = false, features = ["alloc", "oid"] }
-rand_core = { version = "0.9", default-features = false }
-signature = { version = "3.0.0-rc.4", default-features = false, features = ["alloc", "digest", "rand_core"] }
+rand_core = { version = "0.10.0-rc.2", default-features = false }
+signature = { version = "3.0.0-rc.5", default-features = false, features = ["alloc", "digest", "rand_core"] }
 subtle = { version = "2.6.1", default-features = false }
 zeroize = { version = "1.8", features = ["alloc"] }
 
@@ -30,16 +30,17 @@ sha1 = { version = "0.11.0-rc.2", optional = true, default-features = false, fea
 spki = { version = "0.8.0-rc.4", optional = true, default-features = false, features = ["alloc"] }
 sha2 = { version = "0.11.0-rc.2", optional = true, default-features = false, features = ["oid"] }
 serde = { version = "1.0.184", optional = true, default-features = false, features = ["derive"] }
+rand = { version = "0.10.0-rc.1", optional = true, default-features = false }
 
 [dev-dependencies]
 base64ct = { version = "1", features = ["alloc"] }
 hex-literal = "1"
 proptest = "1"
 serde_test = "1.0.89"
 rand_xorshift = "0.4"
-rand_chacha = "0.9"
-rand = "0.9"
-rand_core = { version = "0.9.1", default-features = false }
+chacha20 = { version = "0.10.0-rc.3", default-features = false, features = ["rng"] }
+rand = "0.10.0-rc.1"
+rand_core = { version = "0.10.0-rc.2", default-features = false }
 sha1 = { version = "0.11.0-rc.2", default-features = false, features = ["oid"] }
 sha2 = { version = "0.11.0-rc.2", default-features = false, features = ["oid"] }
 sha3 = { version = "0.11.0-rc.2", default-features = false, features = ["oid"] }
@@ -55,10 +56,10 @@ name = "key"
 default = ["std", "encoding"]
 encoding = ["dep:pkcs1", "dep:pkcs8", "dep:spki"]
 hazmat = []
-os_rng = ["rand_core/os_rng", "crypto-bigint/rand_core"]
+os_rng = ["crypto-bigint/rand_core", "rand/os_rng"]
 serde = ["encoding", "dep:serde", "dep:serdect", "crypto-bigint/serde"]
 pkcs5 = ["pkcs8/encryption"]
-std = ["pkcs1?/std", "pkcs8?/std", "rand_core/std", "crypto-bigint/rand"]
+std = ["pkcs1?/std", "pkcs8?/std", "crypto-bigint/rand"]
 
 [package.metadata.docs.rs]
 features = ["std", "serde", "hazmat", "sha2"]
@@ -69,3 +70,6 @@ opt-level = 2
 
 [profile.bench]
 debug = true
+
+[patch.crates-io]
+crypto-primes = { git = "https://github.com/baloo/crypto-primes.git", branch = "baloo/rand_core/0.10.0-rc.2" }

Cargo.toml

@@ -3,9 +3,10 @@
 extern crate test;
 
 use base64ct::{Base64, Encoding};
+use chacha20::ChaCha8Rng;
 use crypto_bigint::BoxedUint;
 use hex_literal::hex;
-use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+use rand_core::SeedableRng;
 use rsa::{Pkcs1v15Encrypt, Pkcs1v15Sign, RsaPrivateKey};
 use sha2::{Digest, Sha256};
 use test::Bencher;

benches/key.rs

@@ -134,7 +134,8 @@ fn generate_prime_with_rng<R: CryptoRng + ?Sized>(rng: &mut R, bit_length: u32)
 #[cfg(test)]
 mod tests {
     use super::*;
-    use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+    use chacha20::ChaCha8Rng;
+    use rand_core::SeedableRng;
 
     const EXP: u64 = 65537;
 

src/algorithms/generate.rs

@@ -187,7 +187,8 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+    use chacha20::ChaCha8Rng;
+    use rand_core::SeedableRng;
 
     #[test]
     fn test_non_zero_bytes() {

src/algorithms/pkcs1v15.rs

@@ -754,8 +754,9 @@ mod tests {
     use crate::algorithms::rsa::{rsa_decrypt_and_check, rsa_encrypt};
     use crate::traits::{PrivateKeyParts, PublicKeyParts};
 
+    use chacha20::ChaCha8Rng;
     use hex_literal::hex;
-    use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+    use rand_core::SeedableRng;
 
     #[cfg(feature = "encoding")]
     use pkcs8::DecodePrivateKey;
@@ -875,7 +876,8 @@ mod tests {
     #[test]
     #[cfg(all(feature = "hazmat", feature = "serde"))]
     fn test_serde() {
-        use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+        use chacha20::ChaCha8Rng;
+        use rand_core::SeedableRng;
         use serde_test::{assert_tokens, Configure, Token};
 
         let mut rng = ChaCha8Rng::from_seed([42; 32]);

src/key.rs

@@ -326,12 +326,10 @@ mod tests {
     use crate::traits::PublicKeyParts;
     use crate::traits::{Decryptor, RandomizedDecryptor, RandomizedEncryptor};
 
+    use chacha20::ChaCha8Rng;
     use crypto_bigint::BoxedUint;
     use digest::{Digest, FixedOutputReset};
-    use rand_chacha::{
-        rand_core::{RngCore, SeedableRng},
-        ChaCha8Rng,
-    };
+    use rand_core::{RngCore, SeedableRng};
     use sha1::Sha1;
     use sha2::{Sha224, Sha256, Sha384, Sha512};
     use sha3::{Sha3_256, Sha3_384, Sha3_512};

src/oaep.rs

@@ -101,7 +101,8 @@ mod tests {
     #[cfg(all(feature = "hazmat", feature = "serde"))]
     fn test_serde() {
         use super::*;
-        use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+        use chacha20::ChaCha8Rng;
+        use rand_core::SeedableRng;
         use serde_test::{assert_tokens, Configure, Token};
         use sha2::Sha256;
 

src/oaep/decrypting_key.rs

@@ -76,7 +76,8 @@ mod tests {
     #[cfg(all(feature = "hazmat", feature = "serde"))]
     fn test_serde() {
         use super::*;
-        use rand_chacha::{rand_core::SeedableRng, ChaCha8Rng};
+        use chacha20::ChaCha8Rng;
+        use rand_core::SeedableRng;
         use serde_test::{assert_tokens, Configure, Token};
 
         let mut rng = ChaCha8Rng::from_seed([42; 32]);

src/oaep/encrypting_key.rs

@@ -253,11 +253,9 @@ mod tests {
         SignatureEncoding, Signer, Verifier,
     };
     use base64ct::{Base64, Encoding};
+    use chacha20::ChaCha8Rng;
     use hex_literal::hex;
-    use rand_chacha::{
-        rand_core::{RngCore, SeedableRng},
-        ChaCha8Rng,
-    };
+    use rand_core::{RngCore, SeedableRng};
     use rstest::rstest;
     use sha1::{Digest, Sha1};
     use sha2::Sha256;