diff --git a/services/keystore/src/platform/baosec/server.rs b/services/keystore/src/platform/baosec/server.rs index e5469e8c6..244d954b5 100644 --- a/services/keystore/src/platform/baosec/server.rs +++ b/services/keystore/src/platform/baosec/server.rs @@ -1,3 +1,4 @@ +use bao1x_hal::board::{BOOKEND_END, BOOKEND_START}; use bao1x_hal::rram::Reram; use keystore_api::*; use xous::SID; @@ -15,6 +16,12 @@ pub fn keystore(sid: SID) -> ! { // derive the master key store.derive_master_key(); + if store.is_collateral_erased() { + log::info!("{}COLLATERAL.ERASED,{}", BOOKEND_START, BOOKEND_END); + } else { + panic!("Collateral is not erased - protocol error for Baochip firmwares!"); + } + let mut msg_opt = None; // allow preemption once the keystore has claimed locks on all its critical resources diff --git a/services/keystore/src/platform/baosec/store.rs b/services/keystore/src/platform/baosec/store.rs index a5c94f53e..1f397b0d6 100644 --- a/services/keystore/src/platform/baosec/store.rs +++ b/services/keystore/src/platform/baosec/store.rs @@ -7,7 +7,7 @@ use bao1x_api::{ use bao1x_hal::board::{BOOKEND_END, BOOKEND_START}; use bao1x_hal::{ acram::{OneWayCounter, SlotManager}, - board::{CHAFF_KEYS, NUISANCE_KEYS_0, NUISANCE_KEYS_1, ROOT_SEED, THE_FLAG_1}, + board::{CHAFF_KEYS, COLLATERAL, NUISANCE_KEYS_0, NUISANCE_KEYS_1, ROOT_SEED, THE_FLAG_1}, rram::Reram, }; use hkdf::Hkdf; @@ -89,6 +89,15 @@ impl KeyStore { } } + /// returns `true` if collateral is erased + pub fn is_collateral_erased(&mut self) -> bool { + let collateral = self.slot_mgr.read(&COLLATERAL).unwrap(); + let check_val = vec![bao1x_hal::sigcheck::ERASE_VALUE; COLLATERAL.len() * SLOT_ELEMENT_LEN_BYTES]; + // log::info!("collateral: {:x?}", &collateral); + // log::info!("check_val: {:x?}", &check_val); + collateral == &check_val + } + pub fn derive_master_key(&mut self) { let mut ikm = Vec::::new(); let mut salt = Vec::::new();