From 9c0d6c251dabb0b2b6e22898f509c3eae427177b Mon Sep 17 00:00:00 2001 From: Matt Johnston Date: Sun, 5 Mar 2023 23:21:03 +0800 Subject: [PATCH] Use getrandom directly --- Cargo.toml | 3 +-- src/random.rs | 16 ++++------------ 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 5b5f608..dd2cdb7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -36,8 +36,7 @@ no-panic = "0.1" # allows avoiding utf8 for SSH identifier names ascii = { version = "1.0", default-features = false } -rand = { version = "0.8", default-features = false, features = ["getrandom"] } -rand_core = { version = "0.6", default-features = false } +getrandom = "0.2" ctr = { version = "0.9", features = ["zeroize"] } aes = { version = "0.8", features = ["zeroize"] } diff --git a/src/random.rs b/src/random.rs index 4e98794..3bb863e 100644 --- a/src/random.rs +++ b/src/random.rs @@ -4,17 +4,9 @@ use { log::{debug, error, info, log, trace, warn}, }; -use rand::{RngCore, Rng, CryptoRng}; -use core::num::Wrapping; - -pub type SunsetRng = rand::rngs::OsRng; - pub fn fill_random(buf: &mut [u8]) -> Result<(), Error> { - // TODO: can this return an error? - let mut rng = SunsetRng::default(); - rng.try_fill_bytes(buf) - .map_err(|e| { - debug!("RNG failed: {e:?}"); - Error::msg("RNG failed") - }) + getrandom::getrandom(buf) + .map_err(|_| { + Error::msg("RNG failed") + }) }