From 9d73b4732d45b81eb9bfd095138d352a046be2f2 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 31 May 2022 14:16:09 +0800 Subject: [PATCH] stash to look at #171 --- apps/vault/src/ctap/storage.rs | 19 +++++++++++++++++++ apps/vault/src/main.rs | 1 + 2 files changed, 20 insertions(+) diff --git a/apps/vault/src/ctap/storage.rs b/apps/vault/src/ctap/storage.rs index 91dd038dd..0ce4aa552 100644 --- a/apps/vault/src/ctap/storage.rs +++ b/apps/vault/src/ctap/storage.rs @@ -65,6 +65,8 @@ const _DEFAULT_MIN_PIN_LENGTH_RP_IDS: Vec = Vec::new(); #[cfg(feature = "with_ctap2_1")] const _MAX_RP_IDS_LENGTH: usize = 8; +const FIDO_DICT: &'static str = "fido"; + /// Wrapper for master keys. pub struct MasterKeys { /// Master encryption key. @@ -89,13 +91,30 @@ impl PersistentStore { let mut store = PersistentStore { pddb: Pddb::new() }; + // block until the PDDB is mounted + store.pddb.is_mounted_blocking(); store.init().unwrap(); store } /// Initializes the store by creating missing objects. fn init(&mut self) -> Result<(), Ctap2StatusCode> { + // Generate and store the master keys if they are missing. + let master_keys = self.pddb.get( + FIDO_DICT, + key::MASTER_KEYS, + None, true, true, + Some(32), None + ).or(Ctap2StatusCode::CTAP1_ERR_OTHER)?; + let mk_attr = master_keys.attributes().or(Ctap2StatusCode::CTAP1_ERR_OTHER)?; + if mk_attr.len != 32 { + if mk_attr.len != 0 { + log::error!("Master key has an illegal length. Suspect PDDB corruption?"); + return Err(Ctap2StatusCode::CTAP2_ERR_INVALID_CREDENTIAL); + } + } + if self.store.find_handle(key::MASTER_KEYS)?.is_none() { let master_encryption_key = rng.gen_uniform_u8x32(); let master_hmac_key = rng.gen_uniform_u8x32(); diff --git a/apps/vault/src/main.rs b/apps/vault/src/main.rs index 0f640d017..b886203f0 100644 --- a/apps/vault/src/main.rs +++ b/apps/vault/src/main.rs @@ -96,6 +96,7 @@ fn xmain() -> ! { }); let rng = ctap_crypto::rng256::XousRng256::new(&xns); + // this call will block until the PDDB is mounted. let mut ctap_state = CtapState::new(&mut rng, check_user_presence, boot_time); //let mut ctap_hid = CtapHid::new();