From 293a4459442d8e128958cfa7717f0908bcacfd92 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 3 Feb 2026 22:07:14 +0800 Subject: [PATCH] add test command to generate collateral keys this allows us to simulate a third party firmware's behavior so we can test that collateral key states go through the right set of state transitions in various test cases. the collateral test is also made more precise and can now report unititialized/permission denied state --- bao1x-boot/boot1/src/repl.rs | 45 +++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/bao1x-boot/boot1/src/repl.rs b/bao1x-boot/boot1/src/repl.rs index 198b81ac0..09ad5b847 100644 --- a/bao1x-boot/boot1/src/repl.rs +++ b/bao1x-boot/boot1/src/repl.rs @@ -267,7 +267,7 @@ impl Repl { count += 1; } crate::println!("Board type set to {:?} after {} increments", new_type, count); - crate::platform::slots::check_slots(&new_type); + crate::platform::slots::check_slots(); crate::println!("Key & data slots checked according to the new type"); } "altboot" => { @@ -452,8 +452,12 @@ impl Repl { let collateral = slot_mgr.read(&COLLATERAL).unwrap(); let check_val = alloc::vec![bao1x_hal::sigcheck::ERASE_VALUE; COLLATERAL.len() * SLOT_ELEMENT_LEN_BYTES]; + let uninit_val = alloc::vec![0; COLLATERAL.len() * SLOT_ELEMENT_LEN_BYTES]; + // these strings below are used in CI. If they are changed, CI needs to be updated if collateral == &check_val { crate::println!("Collateral erased"); + } else if collateral == &uninit_val { + crate::println!("Collateral is uninitialized or access is denied"); } else { crate::println!("Collateral is set"); } @@ -646,6 +650,45 @@ impl Repl { } } #[cfg(feature = "test-boot0-keys")] + "rand_collateral" => { + use bao1x_hal::acram::AccessSettings; + // put random data in collateral - to simulate a third party keying + let slot_mgr = bao1x_hal::acram::SlotManager::new(); + let mut rram = bao1x_hal::rram::Reram::new(); + let slot = &bao1x_api::offsets::COLLATERAL; + let mut trng = super::trng::ManagedTrng::new(); + // only clear ACL if it isn't already cleared + if slot_mgr + .get_acl(slot) + .unwrap_or(AccessSettings::Data(DataSlotAccess::new_with_raw_value(0xFFFF_FFFF))) + .raw_u32() + != 0 + { + // clear the ACL so we can operate on the data + slot_mgr + .set_acl( + &mut rram, + slot, + &AccessSettings::Data(DataSlotAccess::new_with_raw_value(0)), + ) + .expect("couldn't reset ACL"); + } + let mut random: Vec = alloc::vec::Vec::with_capacity(slot.len() * SLOT_ELEMENT_LEN_BYTES); + random.resize(slot.len() * SLOT_ELEMENT_LEN_BYTES, 0); + for chunk in random.chunks_mut(SLOT_ELEMENT_LEN_BYTES) { + let r = trng.generate_key(); + chunk.copy_from_slice(&r); + } + + slot_mgr.write(&mut rram, slot, &random).ok(); + + let bytes = unsafe { slot_mgr.read_unchecked(slot) }; + crate::println!("Random test data:"); + for (i, chunk) in bytes.chunks(32).enumerate() { + crate::println!(" {:03x}: {:02x?}", i * 32, chunk); + } + } + #[cfg(feature = "test-boot0-keys")] "publock" => { let rram = CSR::new(utra::rrc::HW_RRC_BASE as *mut u32); crate::println!("RRAM security settings: {:x}", rram.rf(utra::rrc::SFR_RRCCR_SFR_RRCCR));