From fbcb59c69e23b03f95bf39c6d0e1d7a572400c40 Mon Sep 17 00:00:00 2001 From: bunnie Date: Sun, 11 May 2025 12:59:00 +0800 Subject: [PATCH] migrations applied to pddb still broken, there is a weird dependency problem on board-baosec target that is still to be debugged, but wanted to get everything committed so i can try bigger experiments without losing state --- services/pddb/Cargo.toml | 7 +++++-- services/pddb/src/api.rs | 6 +++--- services/pddb/src/backend/hw.rs | 10 ++++++---- services/pddb/src/main.rs | 31 +++++++++++++++++-------------- services/pddb/src/ux.rs | 3 ++- 5 files changed, 33 insertions(+), 24 deletions(-) diff --git a/services/pddb/Cargo.toml b/services/pddb/Cargo.toml index c405f7e31..c4792b0a2 100644 --- a/services/pddb/Cargo.toml +++ b/services/pddb/Cargo.toml @@ -34,6 +34,8 @@ aes-gcm-siv = { version = "0.11.1", default-features = false, features = [ ] } # aes-gcm-siv = {git="https://github.com/RustCrypto/AEADs.git", branch="master"} llio = { path = "../llio", optional = true } +precursor-hal = { path = "../../libs/precursor-hal", optional = true } + subtle = { version = "2.4.1", default-features = false } tts-frontend = { path = "../tts", optional = true } rand_core = "0.6.4" @@ -87,8 +89,9 @@ gen1 = [ "tts-frontend", "gam", "modals", + "precursor-hal", ] -gen2 = ["keystore", "keystore-api/gen2"] +gen2 = ["keystore", "keystore-api/gen2", "cramium-hal"] # gen 1 targets precursor = ["utralib/precursor", "sha2/precursor", "gen1"] hosted = ["utralib/hosted", "sha2/hosted", "gen1"] @@ -99,7 +102,7 @@ board-baosec = [ "gen2", "xous-swapper/board-baosec", "cram-hal-service", - "cramium-hal", + "cramium-hal/board-baosec", "modals/board-baosec", ] # USB form factor token hosted-baosec = [ diff --git a/services/pddb/src/api.rs b/services/pddb/src/api.rs index f31b02f60..a1429cba0 100644 --- a/services/pddb/src/api.rs +++ b/services/pddb/src/api.rs @@ -42,13 +42,13 @@ pub(crate) const PDDB_MIGRATE_1: (u32, u32) = (0x00_00_01_01, 0x00_00_02_01); #[allow(dead_code)] pub(crate) const PDDB_VERSION: u32 = 0x00_00_02_01; #[allow(dead_code)] -// PDDB_A_LEN may be shorter than xous::PDDB_LEN, to speed up testing. +// PDDB_A_LEN may be shorter than precursor_hal::board::PDDB_LEN, to speed up testing. #[allow(dead_code)] #[cfg(all( not(any(feature = "pddbtest", feature = "autobasis", feature = "ci", feature = "smalldb")), not(feature = "gen2") ))] -pub(crate) const PDDB_A_LEN: usize = xous::PDDB_LEN as usize; +pub(crate) const PDDB_A_LEN: usize = precursor_hal::board::PDDB_LEN as usize; #[allow(dead_code)] #[cfg(all( any(feature = "pddbtest", feature = "autobasis", feature = "ci", feature = "smalldb"), @@ -58,7 +58,7 @@ pub const PDDB_A_LEN: usize = 4 * 1024 * 1024; #[cfg(feature = "gen2")] pub const PDDB_A_LEN: usize = cramium_hal::board::PDDB_LEN as usize; #[cfg(feature = "gen1")] -pub const PDDB_A_LOC: u32 = xous::PDDB_LOC as u32; +pub const PDDB_A_LOC: u32 = precursor_hal::board::PDDB_LOC as u32; #[cfg(feature = "gen2")] pub const PDDB_A_LOC: u32 = cramium_hal::board::PDDB_LOC as u32; diff --git a/services/pddb/src/backend/hw.rs b/services/pddb/src/backend/hw.rs index eb5aea7c9..f89256448 100644 --- a/services/pddb/src/backend/hw.rs +++ b/services/pddb/src/backend/hw.rs @@ -16,11 +16,13 @@ use aes_gcm_siv::aead::{Aead, Payload}; use aes_gcm_siv::{Aes256GcmSiv, Nonce, Tag}; use backend::bcrypt::*; #[cfg(all(feature = "gen2"))] -use cramium_hal::board::{SPINOR_BULK_ERASE_SIZE, SPINOR_ERASE_SIZE}; +use cramium_hal::board::{BOOKEND_END, BOOKEND_START, SPINOR_BULK_ERASE_SIZE, SPINOR_ERASE_SIZE}; #[cfg(feature = "gen1")] use keystore_api::AesRootkeyType; use keystore_api::{Checksums, KeywrapError}; use modals::Modals; +#[cfg(feature = "gen1")] +use precursor_hal::board::{BOOKEND_END, BOOKEND_START}; use sha2::{Digest, Sha512_256Hw, Sha512_256Sw}; #[cfg(feature = "gen1")] use spinor::{SPINOR_BULK_ERASE_SIZE, SPINOR_ERASE_SIZE}; @@ -207,7 +209,7 @@ impl PddbOs { let xns = xous_names::XousNames::new().unwrap(); #[cfg(any(feature = "precursor", feature = "renode"))] let pddb = xous::syscall::map_memory( - xous::MemoryAddress::new(PDDB_A_LOC as usize + xous::FLASH_PHYS_BASE as usize), + xous::MemoryAddress::new(PDDB_A_LOC as usize + precursor_hal::board::FLASH_PHYS_BASE as usize), None, PDDB_A_LEN as usize, xous::MemoryFlags::R | xous::MemoryFlags::RESERVE, @@ -2014,7 +2016,7 @@ impl PddbOs { let mut checkblock_a = [0u8; BLOCK_SIZE]; self.rootkeys.decrypt_block(GenericArray::from_mut_slice(&mut checkblock_a)); - log::info!("{}PDDB.CHECKPASS,{}", xous::BOOKEND_START, xous::BOOKEND_END); + log::info!("{}PDDB.CHECKPASS,{}", BOOKEND_START, BOOKEND_END); #[cfg(any(feature = "precursor", feature = "renode"))] // skip this dialog in hosted mode modals.show_notification(t!("pddb.checkpass", locales::LANG), None).expect("notification failed"); @@ -2025,7 +2027,7 @@ impl PddbOs { if checkblock_a == checkblock_b { success = true; } else { - log::info!("{}PDDB.PWFAIL,{}", xous::BOOKEND_START, xous::BOOKEND_END); + log::info!("{}PDDB.PWFAIL,{}", BOOKEND_START, BOOKEND_END); modals .show_notification(t!("pddb.checkpass_fail", locales::LANG), None) .expect("notification failed"); diff --git a/services/pddb/src/main.rs b/services/pddb/src/main.rs index 8247604dc..0e39ec446 100644 --- a/services/pddb/src/main.rs +++ b/services/pddb/src/main.rs @@ -456,7 +456,6 @@ use tests::*; #[cfg(feature = "pddb-flamegraph")] mod profiling; - use core::cell::RefCell; use core::fmt::Write; use core::mem::size_of; @@ -470,8 +469,12 @@ use std::sync::Arc; use std::sync::atomic::{AtomicBool, Ordering}; use std::thread; +#[cfg(feature = "gen2")] +use cramium_hal::board::*; use locales::t; use num_traits::*; +#[cfg(feature = "gen1")] +use precursor_hal::board::*; use rkyv::{ Archive, Place, Serialize, api::low::LowSerializer, @@ -809,7 +812,7 @@ fn wrapped_main() -> ! { mount_notifications.len() == 0, "apparently I don't understand what drain() does" ); - log::info!("{}PDDB.MOUNTED,{}", xous::BOOKEND_START, xous::BOOKEND_END); + log::info!("{}PDDB.MOUNTED,{}", BOOKEND_START, BOOKEND_END); xous::return_scalar2(msg.sender, 0, 0).expect("couldn't return scalar"); } else { xous::return_scalar2(msg.sender, 1, 0).expect("couldn't return scalar"); @@ -832,7 +835,7 @@ fn wrapped_main() -> ! { mount_notifications.len() == 0, "apparently I don't understand what drain() does" ); - log::info!("{}PDDB.MOUNTED,{}", xous::BOOKEND_START, xous::BOOKEND_END); + log::info!("{}PDDB.MOUNTED,{}", BOOKEND_START, BOOKEND_END); xous::return_scalar2(msg.sender, 0, 0).expect("couldn't return scalar"); is_mounted.store(true, Ordering::SeqCst); } else { @@ -871,7 +874,7 @@ fn wrapped_main() -> ! { } else { if !pddb_os.rootkeys_initialized() { // can't mount if we have no root keys - log::info!("{}PDDB.SKIPMOUNT,{}", xous::BOOKEND_START, xous::BOOKEND_END); + log::info!("{}PDDB.SKIPMOUNT,{}", BOOKEND_START, BOOKEND_END); // allow the main menu to be used in this case let gam = gam::Gam::new(&xns).unwrap(); gam.allow_mainmenu().expect("couldn't allow main menu activation"); @@ -896,7 +899,7 @@ fn wrapped_main() -> ! { mount_notifications.len() == 0, "apparently I don't understand what drain() does" ); - log::info!("{}PDDB.MOUNTED,{}", xous::BOOKEND_START, xous::BOOKEND_END); + log::info!("{}PDDB.MOUNTED,{}", BOOKEND_START, BOOKEND_END); xous::return_scalar2(msg.sender, 0, 0).expect("couldn't return scalar"); } else { xous::return_scalar2(msg.sender, 1, 0).expect("couldn't return scalar"); @@ -919,7 +922,7 @@ fn wrapped_main() -> ! { mount_notifications.len() == 0, "apparently I don't understand what drain() does" ); - log::info!("{}PDDB.MOUNTED,{}", xous::BOOKEND_START, xous::BOOKEND_END); + log::info!("{}PDDB.MOUNTED,{}", BOOKEND_START, BOOKEND_END); xous::return_scalar2(msg.sender, 0, 0).expect("couldn't return scalar"); is_mounted.store(true, Ordering::SeqCst); } else { @@ -1093,9 +1096,9 @@ fn wrapped_main() -> ! { Ok(_) => { log::info!( "{}PDDB.CREATEOK,{},{}", - xous::BOOKEND_START, + BOOKEND_START, mgmt.name.as_str(), - xous::BOOKEND_END + BOOKEND_END ); mgmt.code = PddbRequestCode::NoErr } @@ -1169,9 +1172,9 @@ fn wrapped_main() -> ! { finished = true; log::info!( "{}PDDB.UNLOCKOK,{},{}", - xous::BOOKEND_START, + BOOKEND_START, mgmt.name.as_str(), - xous::BOOKEND_END + BOOKEND_END ); if basis_monitor_notifications.len() > 0 { notify_basis_change( @@ -1183,9 +1186,9 @@ fn wrapped_main() -> ! { } else { log::info!( "{}PDDB.BADPASS,{},{}", - xous::BOOKEND_START, + BOOKEND_START, mgmt.name.as_str(), - xous::BOOKEND_END + BOOKEND_END ); modals .add_list_item(t!("pddb.yes", locales::LANG)) @@ -2515,7 +2518,7 @@ fn ensure_password(modals: &modals::Modals, pddb_os: &mut PddbOs, _pw_cid: xous: PasswordState::Correct => return PasswordState::Correct, PasswordState::Incorrect(failcount) => { pddb_os.clear_password(); // clear the bad password entry - log::info!("{}PDDB.BADPW,{}", xous::BOOKEND_START, xous::BOOKEND_END); + log::info!("{}PDDB.BADPW,{}", BOOKEND_START, BOOKEND_END); if failcount % 3 == 0 { // every three failures kick the failure back up the stack return PasswordState::ForcedAbort(failcount); @@ -2604,7 +2607,7 @@ fn try_mount_or_format( modals.add_list_item(t!("pddb.okay", locales::LANG)).expect("couldn't build radio item list"); modals.add_list_item(t!("pddb.cancel", locales::LANG)).expect("couldn't build radio item list"); let do_format: bool; - log::info!("{}PDDB.REQFMT,{}", xous::BOOKEND_START, xous::BOOKEND_END); + log::info!("{}PDDB.REQFMT,{}", BOOKEND_START, BOOKEND_END); match modals.get_radiobutton(t!("pddb.requestformat", locales::LANG)) { Ok(response) => { if response.as_str() == t!("pddb.okay", locales::LANG) { diff --git a/services/pddb/src/ux.rs b/services/pddb/src/ux.rs index dbcfe92ad..be7741131 100644 --- a/services/pddb/src/ux.rs +++ b/services/pddb/src/ux.rs @@ -1,6 +1,7 @@ use gam::modal::*; use locales::t; use num_traits::*; +use precursor_hal::board::*; use xous::msg_scalar_unpack; use xous::{CID, SID}; use xous_ipc::Buffer; @@ -110,7 +111,7 @@ pub(crate) fn password_ux_manager( false, None, ); - log::info!("{}PDDB.REQPW,{},{}", xous::BOOKEND_START, db_name.as_str(), xous::BOOKEND_END); + log::info!("{}PDDB.REQPW,{},{}", BOOKEND_START, db_name.as_str(), BOOKEND_END); pddb_modal.activate(); dr = Some(msg); }