From fdb613cfb3ea9bc7a2326092de5b825381fd2853 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 18 Nov 2025 22:40:09 +0800 Subject: [PATCH] fix corner case on non-word aligned buffers --- services/bao1x-hal-service/src/trng/baosec.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/services/bao1x-hal-service/src/trng/baosec.rs b/services/bao1x-hal-service/src/trng/baosec.rs index b076c3631..0de21436d 100644 --- a/services/bao1x-hal-service/src/trng/baosec.rs +++ b/services/bao1x-hal-service/src/trng/baosec.rs @@ -151,10 +151,12 @@ impl Trng { use rand_chacha::rand_core::RngCore; use rand_chacha::rand_core::SeedableRng; + // for very short runs, fill directly from the HW TRNG if dest.len() < 64 { self.fill_bytes_via_next(dest); return; } + // larger runs, seed a ChaCha8 and use its results to fill the buffer let mut seed = [0u8; 32]; self.fill_bytes_via_next(&mut seed); let mut cstrng = ChaCha8Rng::from_seed(seed); @@ -181,7 +183,8 @@ impl RngCore for Trng { let buf = &mut api_buf.data; let mut filled = 0; while filled < dest.len() { - let fetch_len = ((dest.len() - filled) / size_of::()).min(buf.len()); + let fetch_len = ((((dest.len() + 3) & !3) - filled) / size_of::()).min(buf.len()); + log::debug!("fetching {} bytes; filled {} so far", fetch_len * 4, filled); self.fill_buf(&mut buf[..fetch_len]).expect("couldn't fill temp buffer"); for &w in buf[..fetch_len].iter() { let bytes = w.to_le_bytes();