From 69b77f30722c58780ccdf40080039eaae0f294ac Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 18 Nov 2025 19:35:59 +0800 Subject: [PATCH] allow gen2 to use the seeded trng fill --- services/pddb/src/backend/trngpool.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/services/pddb/src/backend/trngpool.rs b/services/pddb/src/backend/trngpool.rs index 061883ad3..338d0caac 100644 --- a/services/pddb/src/backend/trngpool.rs +++ b/services/pddb/src/backend/trngpool.rs @@ -7,6 +7,7 @@ use aes_gcm_siv::Nonce; use bao1x_emu::trng::Trng; #[cfg(all(feature = "bao1x-hal", not(feature = "hosted-baosec")))] use bao1x_hal_service::trng::Trng; +#[cfg(not(feature = "gen2"))] use rand_core::RngCore; #[cfg(all(not(feature = "bao1x-hal"), not(feature = "hosted-baosec")))] use trng::Trng; @@ -23,14 +24,22 @@ impl TrngPool { let xns = xous_names::XousNames::new().unwrap(); let mut trng = Trng::new(&xns).unwrap(); let mut cache: [u8; 8192] = [0; 8192]; + #[cfg(not(feature = "gen2"))] trng.fill_bytes(&mut cache); + // speed up gen2 ops with seeded fill + #[cfg(feature = "gen2")] + trng.fill_seeded_bytes(&mut cache); TrngPool { trng: RefCell::new(trng), e_cache: RefCell::new(cache.to_vec()) } } pub(crate) fn ensure_entropy(&self, amount: usize) { if self.e_cache.borrow().len() < amount { let mut cache: [u8; 8192] = [0; 8192]; + #[cfg(not(feature = "gen2"))] self.trng.borrow_mut().fill_bytes(&mut cache); + // speed up gen2 ops with seeded fill + #[cfg(feature = "gen2")] + self.trng.borrow_mut().fill_seeded_bytes(&mut cache); self.e_cache.borrow_mut().extend_from_slice(&cache); } }