saymrwulf/curve25519-dalek-source
1
0
Fork 0
mirror of https://github.com/saymrwulf/curve25519-dalek-source.git synced 2026-09-05 20:30:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use CryptoRngCore trait (#469)

Browse source 
This is a convenience/marker trait for types which impl `CryptoRng` +
`RngCore` which makes the type signatures a little more readable.

It was introduced in `rand_core` v0.6.4 (now pinned as the minimum
version)
This commit is contained in:
Tony Arcieri 2022-12-11 13:11:15 -07:00 committed by GitHub
parent cb42e87096
commit fa45d21b76
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Cargo.toml
View file

@ -48,7 +48,7 @@ required-features = ["rand_core"]
[dependencies] [dependencies]
cfg-if = "1" cfg-if = "1"
rand_core = { version = "0.6", default-features = false, optional = true } rand_core = { version = "0.6.4", default-features = false, optional = true }
digest = { version = "0.10", default-features = false, optional = true } digest = { version = "0.10", default-features = false, optional = true }
subtle = { version = "^2.2.1", default-features = false } subtle = { version = "^2.2.1", default-features = false }
serde = { version = "1.0", default-features = false, optional = true, features = ["derive"] } serde = { version = "1.0", default-features = false, optional = true, features = ["derive"] }

7
src/ristretto.rs
View file

@ -169,7 +169,7 @@ use core::ops::{AddAssign, SubAssign};
use core::ops::{Mul, MulAssign}; use core::ops::{Mul, MulAssign};
#[cfg(any(test, feature = "rand_core"))] #[cfg(any(test, feature = "rand_core"))]
use rand_core::{CryptoRng, RngCore}; use rand_core::CryptoRngCore;
#[cfg(feature = "digest")] #[cfg(feature = "digest")]
use digest::generic_array::typenum::U64; use digest::generic_array::typenum::U64;
@ -675,7 +675,8 @@ impl RistrettoPoint {
/// ///
/// # Inputs /// # Inputs
/// ///
/// * `rng`: any RNG which implements the `RngCore + CryptoRng` interface. /// * `rng`: any RNG which implements `CryptoRngCore`
/// (i.e. `CryptoRng` + `RngCore`) interface.
/// ///
/// # Returns /// # Returns
/// ///
@ -687,7 +688,7 @@ impl RistrettoPoint {
/// discrete log of the output point with respect to any other /// discrete log of the output point with respect to any other
/// point should be unknown. The map is applied twice and the /// point should be unknown. The map is applied twice and the
/// results are added, to ensure a uniform distribution. /// results are added, to ensure a uniform distribution.
pub fn random<R: RngCore + CryptoRng + ?Sized>(rng: &mut R) -> Self { pub fn random<R: CryptoRngCore + ?Sized>(rng: &mut R) -> Self {
let mut uniform_bytes = [0u8; 64]; let mut uniform_bytes = [0u8; 64];
rng.fill_bytes(&mut uniform_bytes); rng.fill_bytes(&mut uniform_bytes);

7
src/scalar.rs
View file

@ -153,7 +153,7 @@ use core::ops::{Sub, SubAssign};
use cfg_if::cfg_if; use cfg_if::cfg_if;
#[cfg(any(test, feature = "rand_core"))] #[cfg(any(test, feature = "rand_core"))]
use rand_core::{CryptoRng, RngCore}; use rand_core::CryptoRngCore;
#[cfg(feature = "digest")] #[cfg(feature = "digest")]
use digest::generic_array::typenum::U64; use digest::generic_array::typenum::U64;
@ -574,7 +574,8 @@ impl Scalar {
/// ///
/// # Inputs /// # Inputs
/// ///
/// * `rng`: any RNG which implements the `RngCore + CryptoRng` interface. /// * `rng`: any RNG which implements `CryptoRngCore`
/// (i.e. `CryptoRng` + `RngCore`) interface.
/// ///
/// # Returns /// # Returns
/// ///
@ -591,7 +592,7 @@ impl Scalar {
/// let mut csprng = OsRng; /// let mut csprng = OsRng;
/// let a: Scalar = Scalar::random(&mut csprng); /// let a: Scalar = Scalar::random(&mut csprng);
/// # } /// # }
pub fn random<R: RngCore + CryptoRng + ?Sized>(rng: &mut R) -> Self { pub fn random<R: CryptoRngCore + ?Sized>(rng: &mut R) -> Self {
let mut scalar_bytes = [0u8; 64]; let mut scalar_bytes = [0u8; 64];
rng.fill_bytes(&mut scalar_bytes); rng.fill_bytes(&mut scalar_bytes);
Scalar::from_bytes_mod_order_wide(&scalar_bytes) Scalar::from_bytes_mod_order_wide(&scalar_bytes)