Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add AllowedRng trait #187

Merged
merged 3 commits into from
Oct 31, 2022
Merged

Add AllowedRng trait #187

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3a3ad3
Add AllowedRng trait
benr-ml Oct 31, 2022
0c015cb
fmt
benr-ml Oct 31, 2022
75269a1
fix comments
benr-ml Oct 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion fastcrypto/src/traits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// SPDX-License-Identifier: Apache-2.0
use eyre::eyre;

use rand::rngs::{StdRng, ThreadRng};
use rand::{CryptoRng, RngCore};
use serde::{de::DeserializeOwned, Serialize};
pub use signature::Signer;
Expand Down Expand Up @@ -284,9 +285,20 @@ pub trait AuthenticatedCipher {
/// Trait impl'd by a keys/secret seeds for generating a secure instance.
///
pub trait FromUniformBytes<const LENGTH: usize>: ToFromBytes {
fn generate<R: CryptoRng + RngCore>(rng: &mut R) -> Self {
fn generate<R: AllowedRng>(rng: &mut R) -> Self {
let mut bytes = [0u8; LENGTH];
rng.fill_bytes(&mut bytes);
Self::from_bytes(&bytes).unwrap()
}
}

// Whitelist the RNG our APIs accept (see https://rust-random.github.io/book/guide-rngs.html for
// others).
pub trait AllowedRng: CryptoRng + RngCore {}

// StdRng uses ChaCha12 (see https://github.com/rust-random/rand/issues/932).
// It should be seeded with OsRng (e.g., StdRng::from_rng(OsRng)).
// TODO: Deprecate StdRng (expect for tests) and use thread_rng() everywhere.
impl AllowedRng for StdRng {}
// thread_rng() uses OsRng for the seed, and ChaCha12 as the PRG function.
impl AllowedRng for ThreadRng {}