From 622652393cc0cc537d273efa24ba5e500731c3b7 Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 23 May 2024 14:44:10 +0800 Subject: [PATCH] refactor TRNG reseed code refcell leads to some panics in multithreaded code. Use an atomic usize to track reseed interval, which is a bit safer. --- services/cram-hal-service/src/trng.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/services/cram-hal-service/src/trng.rs b/services/cram-hal-service/src/trng.rs index 9244052e1..b0927d418 100644 --- a/services/cram-hal-service/src/trng.rs +++ b/services/cram-hal-service/src/trng.rs @@ -1,14 +1,16 @@ use std::cell::RefCell; +use std::sync::atomic::{AtomicU32, Ordering}; use rand_chacha::ChaCha8Rng; use rand_core::{CryptoRng, RngCore, SeedableRng}; const RESEED_INTERVAL: u32 = 32; +static RESEED: AtomicU32 = AtomicU32::new(0); + #[derive(Debug)] pub struct Trng { csprng: RefCell, - reseed_ctr: RefCell, } impl Trng { pub fn new(_xns: &xous_names::XousNames) -> Result { @@ -17,14 +19,16 @@ impl Trng { (xous::create_server_id().unwrap().to_u32().0 as u64) | ((xous::create_server_id().unwrap().to_u32().0 as u64) << 32), )), - reseed_ctr: RefCell::new(0), }) } fn reseed(&self) { - *self.reseed_ctr.borrow_mut() = *self.reseed_ctr.borrow() + 1; - if *self.reseed_ctr.borrow() > RESEED_INTERVAL { - *self.reseed_ctr.borrow_mut() = 0; + let reseed_ctr = match RESEED.fetch_update(Ordering::SeqCst, Ordering::SeqCst, |x| Some(x + 1)) { + Ok(x) => x, + Err(x) => x, + }; + if reseed_ctr > RESEED_INTERVAL { + RESEED.store(0, Ordering::SeqCst); // incorporate randomness from the TRNG let half = self.csprng.borrow_mut().next_u32(); self.csprng.replace(rand_chacha::ChaCha8Rng::seed_from_u64(