Update chacha20 and use chacha20::ChaChaCore

Author: dhardy

Cargo.lock

@@ -75,7 +75,7 @@ exclude = ["benches", "distr_test"]
 rand_core = { version = "0.10.0-rc-6", default-features = false }
 log = { version = "0.4.4", optional = true }
 serde = { version = "1.0.103", features = ["derive"], optional = true }
-chacha20 = { version = "0.10.0-rc.9", default-features = false, features = ["rng"], optional = true }
+chacha20 = { version = "0.10.0-rc.10", default-features = false, features = ["rng"], optional = true }
 getrandom = { version = "0.4.0-rc.1", optional = true }
 
 [dev-dependencies]

Cargo.toml

@@ -11,9 +11,6 @@
 use core::convert::Infallible;
 use rand_core::{SeedableRng, TryCryptoRng, TryRng};
 
-#[cfg(any(test, feature = "sys_rng"))]
-pub(crate) use chacha20::ChaCha12Core as Core;
-
 use chacha20::ChaCha12Rng as Rng;
 
 /// A strong, fast (amortized), non-portable RNG

src/rngs/std.rs

@@ -14,7 +14,6 @@ use std::fmt;
 use std::rc::Rc;
 use std::thread_local;
 
-use super::std::Core;
 use super::{SysError, SysRng};
 use rand_core::SeedableRng;
 use rand_core::block::{BlockRng, Generator};
@@ -39,6 +38,7 @@ use rand_core::{TryCryptoRng, TryRng};
 // of 32 kB and less. We choose 64 kB to avoid significant overhead.
 const THREAD_RNG_RESEED_THRESHOLD: i64 = 1024 * 64;
 
+type Core = chacha20::ChaChaCore<chacha20::R12, chacha20::variants::Legacy>;
 type Results = <Core as Generator>::Output;
 
 struct ReseedingCore {