Bump rand_core to v0.10.0-rc-3

Most of the changes in this PR are actually from the associated `rand`
crate updates which are happening in rust-random/rand#1697, notably
`OsRng` has been renamed to `SysRng` (and is now provided by the
`getrandom` crate).

We do use some `rand_core` APIs in a few places though, like the STROBE
implementation, where this migrates from `rand_core::le` to
`rand_core::utils`.

Author: tarcieri

Cargo.toml

@@ -14,3 +14,7 @@ opt-level = 2
 curve25519-dalek-derive = { path = "./curve25519-dalek-derive" }
 curve25519-dalek = { path = "./curve25519-dalek" }
 x25519-dalek = { path = "./x25519-dalek" }
+
+# https://github.com/rust-random/rand/pull/1697
+rand = { git = "https://github.com/rust-random/rand", rev = "99ae06fb348e5c5fee0fe41d2201bd4cbb107635" }
+getrandom = { git = "https://github.com/rust-random/getrandom.git", rev = "f67c70110f706f80d7dd6fa52e38d0920754fe2c" }

curve25519-dalek/Cargo.toml

@@ -50,7 +50,7 @@ required-features = ["alloc", "rand_core"]
 cfg-if = "1"
 ff = { version = "=0.14.0-pre.0", package = "rustcrypto-ff", default-features = false, optional = true }
 group = { version = "=0.14.0-pre.0", package = "rustcrypto-group", default-features = false, optional = true }
-rand_core = { version = "0.10.0-rc-2", default-features = false, optional = true }
+rand_core = { version = "0.10.0-rc-3", default-features = false, optional = true }
 digest = { version = "0.11.0-rc.4", default-features = false, optional = true, features = [
     "block-api",
 ] }

curve25519-dalek/benches/dalek_benchmarks.rs

@@ -1,6 +1,6 @@
 #![allow(non_snake_case)]
 
-use rand::{RngCore, TryRngCore, rng, rngs::OsRng};
+use rand::{RngCore, TryRngCore, rng, rngs::SysRng};
 
 use criterion::{
     BatchSize, BenchmarkGroup, BenchmarkId, Criterion, criterion_main, measurement::Measurement,
@@ -31,7 +31,7 @@ mod edwards_benches {
                 BenchmarkId::new("Batch EdwardsPoint compression", batch_size),
                 &batch_size,
                 |b, &size| {
-                    let mut rng = OsRng.unwrap_err();
+                    let mut rng = SysRng.unwrap_err();
                     let points: Vec<EdwardsPoint> =
                         (0..size).map(|_| EdwardsPoint::random(&mut rng)).collect();
                     b.iter(|| EdwardsPoint::compress_batch_alloc(&points));
@@ -301,7 +301,7 @@ mod ristretto_benches {
                 BenchmarkId::new("Batch Ristretto double-and-encode", *batch_size),
                 &batch_size,
                 |b, &&size| {
-                    let mut rng = OsRng;
+                    let mut rng = SysRng;
                     let points: Vec<RistrettoPoint> = (0..size)
                         .map(|_| RistrettoPoint::try_from_rng(&mut rng).unwrap())
                         .collect();
@@ -388,7 +388,7 @@ mod scalar_benches {
                 BenchmarkId::new("Batch scalar inversion", *batch_size),
                 &batch_size,
                 |b, &&size| {
-                    let mut rng = OsRng.unwrap_err();
+                    let mut rng = SysRng.unwrap_err();
                     let scalars: Vec<Scalar> =
                         (0..size).map(|_| Scalar::random(&mut rng)).collect();
                     b.iter(|| {

curve25519-dalek/src/edwards.rs

@@ -2080,7 +2080,7 @@ mod test {
     /// Check that mul_base_clamped and mul_clamped agree
     #[test]
     fn mul_base_clamped() {
-        let mut csprng = rand::rngs::OsRng;
+        let mut csprng = rand::rngs::SysRng;
 
         // Make a random curve point in the curve. Give it torsion to make things interesting.
         #[cfg(feature = "precomputed-tables")]

curve25519-dalek/src/montgomery.rs

@@ -622,7 +622,7 @@ mod test {
     #[cfg(feature = "rand_core")]
     #[test]
     fn montgomery_ladder_matches_edwards_scalarmult() {
-        let mut csprng = rand::rngs::OsRng.unwrap_err();
+        let mut csprng = rand::rngs::SysRng.unwrap_err();
 
         for _ in 0..100 {
             let p_edwards = rand_prime_order_point(&mut csprng);
@@ -641,7 +641,7 @@ mod test {
     #[cfg(feature = "rand_core")]
     #[test]
     fn montgomery_mul_bits_be() {
-        let mut csprng = rand::rngs::OsRng.unwrap_err();
+        let mut csprng = rand::rngs::SysRng.unwrap_err();
 
         for _ in 0..100 {
             // Make a random prime-order point P
@@ -666,7 +666,7 @@ mod test {
     // integers b₁, b₂ and random (curve or twist) point P.
     #[test]
     fn montgomery_mul_bits_be_twist() {
-        let mut csprng = rand::rngs::OsRng.unwrap_err();
+        let mut csprng = rand::rngs::SysRng.unwrap_err();
 
         for _ in 0..100 {
             // Make a random point P on the curve or its twist
@@ -699,7 +699,7 @@ mod test {
     /// Check that mul_base_clamped and mul_clamped agree
     #[test]
     fn mul_base_clamped() {
-        let mut csprng = rand::rngs::OsRng;
+        let mut csprng = rand::rngs::SysRng;
 
         // Test agreement on a large integer. Even after clamping, this is not reduced mod l.
         let a_bytes = [0xff; 32];

curve25519-dalek/src/ristretto.rs

@@ -543,12 +543,12 @@ impl RistrettoPoint {
     #[cfg_attr(feature = "rand_core", doc = "```")]
     #[cfg_attr(not(feature = "rand_core"), doc = "```ignore")]
     /// # use curve25519_dalek::ristretto::RistrettoPoint;
-    /// use rand::{rngs::OsRng, TryRngCore};
+    /// use rand::{rngs::SysRng, TryRngCore};
     ///
     /// # // Need fn main() here in comment so the doctest compiles
     /// # // See https://doc.rust-lang.org/book/documentation.html#documentation-as-tests
     /// # fn main() {
-    /// let mut rng = OsRng.unwrap_err();
+    /// let mut rng = SysRng.unwrap_err();
     ///
     /// let points: Vec<RistrettoPoint> =
     ///     (0..32).map(|_| RistrettoPoint::random(&mut rng)).collect();
@@ -1278,7 +1278,7 @@ mod test {
     #[cfg(feature = "group")]
     use proptest::prelude::*;
     #[cfg(feature = "rand_core")]
-    use rand::{TryRngCore, rngs::OsRng};
+    use rand::{TryRngCore, rngs::SysRng};
 
     #[test]
     #[cfg(feature = "serde")]
@@ -1472,7 +1472,7 @@ mod test {
     #[cfg(feature = "rand_core")]
     #[test]
     fn four_torsion_random() {
-        let mut rng = OsRng.unwrap_err();
+        let mut rng = SysRng.unwrap_err();
         let P = RistrettoPoint::mul_base(&Scalar::random(&mut rng));
         let P_coset = P.coset4();
         for point in P_coset {
@@ -1483,7 +1483,7 @@ mod test {
     #[cfg(feature = "rand_core")]
     #[test]
     fn random_roundtrip() {
-        let mut rng = OsRng.unwrap_err();
+        let mut rng = SysRng.unwrap_err();
         for _ in 0..100 {
             let P = RistrettoPoint::mul_base(&Scalar::random(&mut rng));
             let compressed_P = P.compress();
@@ -1496,7 +1496,7 @@ mod test {
     #[cfg(all(feature = "alloc", feature = "rand_core", feature = "group"))]
     fn double_and_compress_1024_random_points() {
         use group::Group;
-        let mut rng = OsRng;
+        let mut rng = SysRng;
 
         let mut points: Vec<RistrettoPoint> = (0..1024)
             .map(|_| RistrettoPoint::try_from_rng(&mut rng).unwrap())

curve25519-dalek/src/scalar.rs

@@ -583,9 +583,9 @@ impl Scalar {
     /// # fn main() {
     /// use curve25519_dalek::scalar::Scalar;
     ///
-    /// use rand::{rngs::OsRng, TryRngCore};
+    /// use rand::{rngs::SysRng, TryRngCore};
     ///
-    /// let mut csprng = OsRng.unwrap_err();
+    /// let mut csprng = SysRng.unwrap_err();
     /// let a: Scalar = Scalar::random(&mut csprng);
     /// # }
     #[cfg(feature = "rand_core")]

ed25519-dalek/Cargo.toml

@@ -38,7 +38,7 @@ subtle = { version = "2.3.0", default-features = false }
 
 # optional features
 keccak = { version = "0.2.0-rc.0", default-features = false, optional = true }
-rand_core = { version = "0.10.0-rc-2", default-features = false, optional = true }
+rand_core = { version = "0.10.0-rc-3", default-features = false, optional = true }
 serde = { version = "1.0", default-features = false, optional = true }
 zeroize = { version = "1.5", default-features = false, optional = true }
 

ed25519-dalek/src/batch.rs

@@ -50,11 +50,11 @@ struct ZeroRng;
 
 impl rand_core::RngCore for ZeroRng {
     fn next_u32(&mut self) -> u32 {
-        rand_core::le::next_u32_via_fill(self)
+        rand_core::utils::next_word_via_fill(self)
     }
 
     fn next_u64(&mut self) -> u64 {
-        rand_core::le::next_u64_via_fill(self)
+        rand_core::utils::next_word_via_fill(self)
     }
 
     /// A no-op function which leaves the destination bytes for randomness unchanged.
@@ -124,11 +124,11 @@ fn gen_u128<R: RngCore>(rng: &mut R) -> u128 {
 /// use ed25519_dalek::{
 ///     verify_batch, SigningKey, VerifyingKey, Signer, Signature,
 /// };
-/// use rand::rngs::OsRng;
+/// use rand::rngs::SysRng;
 /// use rand_core::TryRngCore;
 ///
 /// # fn main() {
-/// let mut csprng = OsRng.unwrap_err();
+/// let mut csprng = SysRng.unwrap_err();
 /// let signing_keys: Vec<_> = (0..64).map(|_| SigningKey::generate(&mut csprng)).collect();
 /// let msg: &[u8] = b"They're good dogs Brant";
 /// let messages: Vec<_> = (0..64).map(|_| msg).collect();

ed25519-dalek/src/batch/transcript.rs

@@ -187,11 +187,11 @@ pub struct TranscriptRng {
 
 impl rand_core::RngCore for TranscriptRng {
     fn next_u32(&mut self) -> u32 {
-        rand_core::le::next_u32_via_fill(self)
+        rand_core::utils::next_word_via_fill(self)
     }
 
     fn next_u64(&mut self) -> u64 {
-        rand_core::le::next_u64_via_fill(self)
+        rand_core::utils::next_word_via_fill(self)
     }
 
     fn fill_bytes(&mut self, dest: &mut [u8]) {