chore: remove direct dependency on chacha20 (#601)

Followup to #600

Author: baloo

Cargo.lock

@@ -38,8 +38,7 @@ hex-literal = "1"
 proptest = "1"
 serde_test = "1.0.89"
 rand_xorshift = "0.4"
-chacha20 = { version = "0.10.0-rc.3", default-features = false, features = ["rng"] }
-rand = "0.10.0-rc.1"
+rand = { version = "0.10.0-rc.1", features = ["chacha"] }
 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"] }

Cargo.toml

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

benches/key.rs

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

src/algorithms/generate.rs

@@ -187,7 +187,7 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use chacha20::ChaCha8Rng;
+    use rand::rngs::ChaCha8Rng;
     use rand_core::SeedableRng;
 
     #[test]

src/algorithms/pkcs1v15.rs

@@ -754,8 +754,8 @@ 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::rngs::ChaCha8Rng;
     use rand_core::SeedableRng;
 
     #[cfg(feature = "encoding")]
@@ -876,7 +876,7 @@ mod tests {
     #[test]
     #[cfg(all(feature = "hazmat", feature = "serde"))]
     fn test_serde() {
-        use chacha20::ChaCha8Rng;
+        use rand::rngs::ChaCha8Rng;
         use rand_core::SeedableRng;
         use serde_test::{assert_tokens, Configure, Token};
 

src/key.rs

@@ -326,9 +326,9 @@ 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::rngs::ChaCha8Rng;
     use rand_core::{RngCore, SeedableRng};
     use sha1::Sha1;
     use sha2::{Sha224, Sha256, Sha384, Sha512};

src/oaep.rs

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

src/oaep/decrypting_key.rs

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

src/oaep/encrypting_key.rs

@@ -253,8 +253,8 @@ mod tests {
         SignatureEncoding, Signer, Verifier,
     };
     use base64ct::{Base64, Encoding};
-    use chacha20::ChaCha8Rng;
     use hex_literal::hex;
+    use rand::rngs::ChaCha8Rng;
     use rand_core::{RngCore, SeedableRng};
     use rstest::rstest;
     use sha1::{Digest, Sha1};