mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
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
This commit is contained in:
parent
7af009be78
commit
fbcb59c69e
5 changed files with 33 additions and 24 deletions
|
|
@ -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"}
|
# aes-gcm-siv = {git="https://github.com/RustCrypto/AEADs.git", branch="master"}
|
||||||
llio = { path = "../llio", optional = true }
|
llio = { path = "../llio", optional = true }
|
||||||
|
precursor-hal = { path = "../../libs/precursor-hal", optional = true }
|
||||||
|
|
||||||
subtle = { version = "2.4.1", default-features = false }
|
subtle = { version = "2.4.1", default-features = false }
|
||||||
tts-frontend = { path = "../tts", optional = true }
|
tts-frontend = { path = "../tts", optional = true }
|
||||||
rand_core = "0.6.4"
|
rand_core = "0.6.4"
|
||||||
|
|
@ -87,8 +89,9 @@ gen1 = [
|
||||||
"tts-frontend",
|
"tts-frontend",
|
||||||
"gam",
|
"gam",
|
||||||
"modals",
|
"modals",
|
||||||
|
"precursor-hal",
|
||||||
]
|
]
|
||||||
gen2 = ["keystore", "keystore-api/gen2"]
|
gen2 = ["keystore", "keystore-api/gen2", "cramium-hal"]
|
||||||
# gen 1 targets
|
# gen 1 targets
|
||||||
precursor = ["utralib/precursor", "sha2/precursor", "gen1"]
|
precursor = ["utralib/precursor", "sha2/precursor", "gen1"]
|
||||||
hosted = ["utralib/hosted", "sha2/hosted", "gen1"]
|
hosted = ["utralib/hosted", "sha2/hosted", "gen1"]
|
||||||
|
|
@ -99,7 +102,7 @@ board-baosec = [
|
||||||
"gen2",
|
"gen2",
|
||||||
"xous-swapper/board-baosec",
|
"xous-swapper/board-baosec",
|
||||||
"cram-hal-service",
|
"cram-hal-service",
|
||||||
"cramium-hal",
|
"cramium-hal/board-baosec",
|
||||||
"modals/board-baosec",
|
"modals/board-baosec",
|
||||||
] # USB form factor token
|
] # USB form factor token
|
||||||
hosted-baosec = [
|
hosted-baosec = [
|
||||||
|
|
|
||||||
|
|
@ -42,13 +42,13 @@ pub(crate) const PDDB_MIGRATE_1: (u32, u32) = (0x00_00_01_01, 0x00_00_02_01);
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
pub(crate) const PDDB_VERSION: u32 = 0x00_00_02_01;
|
pub(crate) const PDDB_VERSION: u32 = 0x00_00_02_01;
|
||||||
#[allow(dead_code)]
|
#[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)]
|
#[allow(dead_code)]
|
||||||
#[cfg(all(
|
#[cfg(all(
|
||||||
not(any(feature = "pddbtest", feature = "autobasis", feature = "ci", feature = "smalldb")),
|
not(any(feature = "pddbtest", feature = "autobasis", feature = "ci", feature = "smalldb")),
|
||||||
not(feature = "gen2")
|
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)]
|
#[allow(dead_code)]
|
||||||
#[cfg(all(
|
#[cfg(all(
|
||||||
any(feature = "pddbtest", feature = "autobasis", feature = "ci", feature = "smalldb"),
|
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")]
|
#[cfg(feature = "gen2")]
|
||||||
pub const PDDB_A_LEN: usize = cramium_hal::board::PDDB_LEN as usize;
|
pub const PDDB_A_LEN: usize = cramium_hal::board::PDDB_LEN as usize;
|
||||||
#[cfg(feature = "gen1")]
|
#[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")]
|
#[cfg(feature = "gen2")]
|
||||||
pub const PDDB_A_LOC: u32 = cramium_hal::board::PDDB_LOC as u32;
|
pub const PDDB_A_LOC: u32 = cramium_hal::board::PDDB_LOC as u32;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,11 +16,13 @@ use aes_gcm_siv::aead::{Aead, Payload};
|
||||||
use aes_gcm_siv::{Aes256GcmSiv, Nonce, Tag};
|
use aes_gcm_siv::{Aes256GcmSiv, Nonce, Tag};
|
||||||
use backend::bcrypt::*;
|
use backend::bcrypt::*;
|
||||||
#[cfg(all(feature = "gen2"))]
|
#[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")]
|
#[cfg(feature = "gen1")]
|
||||||
use keystore_api::AesRootkeyType;
|
use keystore_api::AesRootkeyType;
|
||||||
use keystore_api::{Checksums, KeywrapError};
|
use keystore_api::{Checksums, KeywrapError};
|
||||||
use modals::Modals;
|
use modals::Modals;
|
||||||
|
#[cfg(feature = "gen1")]
|
||||||
|
use precursor_hal::board::{BOOKEND_END, BOOKEND_START};
|
||||||
use sha2::{Digest, Sha512_256Hw, Sha512_256Sw};
|
use sha2::{Digest, Sha512_256Hw, Sha512_256Sw};
|
||||||
#[cfg(feature = "gen1")]
|
#[cfg(feature = "gen1")]
|
||||||
use spinor::{SPINOR_BULK_ERASE_SIZE, SPINOR_ERASE_SIZE};
|
use spinor::{SPINOR_BULK_ERASE_SIZE, SPINOR_ERASE_SIZE};
|
||||||
|
|
@ -207,7 +209,7 @@ impl PddbOs {
|
||||||
let xns = xous_names::XousNames::new().unwrap();
|
let xns = xous_names::XousNames::new().unwrap();
|
||||||
#[cfg(any(feature = "precursor", feature = "renode"))]
|
#[cfg(any(feature = "precursor", feature = "renode"))]
|
||||||
let pddb = xous::syscall::map_memory(
|
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,
|
None,
|
||||||
PDDB_A_LEN as usize,
|
PDDB_A_LEN as usize,
|
||||||
xous::MemoryFlags::R | xous::MemoryFlags::RESERVE,
|
xous::MemoryFlags::R | xous::MemoryFlags::RESERVE,
|
||||||
|
|
@ -2014,7 +2016,7 @@ impl PddbOs {
|
||||||
let mut checkblock_a = [0u8; BLOCK_SIZE];
|
let mut checkblock_a = [0u8; BLOCK_SIZE];
|
||||||
self.rootkeys.decrypt_block(GenericArray::from_mut_slice(&mut checkblock_a));
|
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
|
#[cfg(any(feature = "precursor", feature = "renode"))] // skip this dialog in hosted mode
|
||||||
modals.show_notification(t!("pddb.checkpass", locales::LANG), None).expect("notification failed");
|
modals.show_notification(t!("pddb.checkpass", locales::LANG), None).expect("notification failed");
|
||||||
|
|
||||||
|
|
@ -2025,7 +2027,7 @@ impl PddbOs {
|
||||||
if checkblock_a == checkblock_b {
|
if checkblock_a == checkblock_b {
|
||||||
success = true;
|
success = true;
|
||||||
} else {
|
} else {
|
||||||
log::info!("{}PDDB.PWFAIL,{}", xous::BOOKEND_START, xous::BOOKEND_END);
|
log::info!("{}PDDB.PWFAIL,{}", BOOKEND_START, BOOKEND_END);
|
||||||
modals
|
modals
|
||||||
.show_notification(t!("pddb.checkpass_fail", locales::LANG), None)
|
.show_notification(t!("pddb.checkpass_fail", locales::LANG), None)
|
||||||
.expect("notification failed");
|
.expect("notification failed");
|
||||||
|
|
|
||||||
|
|
@ -456,7 +456,6 @@ use tests::*;
|
||||||
|
|
||||||
#[cfg(feature = "pddb-flamegraph")]
|
#[cfg(feature = "pddb-flamegraph")]
|
||||||
mod profiling;
|
mod profiling;
|
||||||
|
|
||||||
use core::cell::RefCell;
|
use core::cell::RefCell;
|
||||||
use core::fmt::Write;
|
use core::fmt::Write;
|
||||||
use core::mem::size_of;
|
use core::mem::size_of;
|
||||||
|
|
@ -470,8 +469,12 @@ use std::sync::Arc;
|
||||||
use std::sync::atomic::{AtomicBool, Ordering};
|
use std::sync::atomic::{AtomicBool, Ordering};
|
||||||
use std::thread;
|
use std::thread;
|
||||||
|
|
||||||
|
#[cfg(feature = "gen2")]
|
||||||
|
use cramium_hal::board::*;
|
||||||
use locales::t;
|
use locales::t;
|
||||||
use num_traits::*;
|
use num_traits::*;
|
||||||
|
#[cfg(feature = "gen1")]
|
||||||
|
use precursor_hal::board::*;
|
||||||
use rkyv::{
|
use rkyv::{
|
||||||
Archive, Place, Serialize,
|
Archive, Place, Serialize,
|
||||||
api::low::LowSerializer,
|
api::low::LowSerializer,
|
||||||
|
|
@ -809,7 +812,7 @@ fn wrapped_main() -> ! {
|
||||||
mount_notifications.len() == 0,
|
mount_notifications.len() == 0,
|
||||||
"apparently I don't understand what drain() does"
|
"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");
|
xous::return_scalar2(msg.sender, 0, 0).expect("couldn't return scalar");
|
||||||
} else {
|
} else {
|
||||||
xous::return_scalar2(msg.sender, 1, 0).expect("couldn't return scalar");
|
xous::return_scalar2(msg.sender, 1, 0).expect("couldn't return scalar");
|
||||||
|
|
@ -832,7 +835,7 @@ fn wrapped_main() -> ! {
|
||||||
mount_notifications.len() == 0,
|
mount_notifications.len() == 0,
|
||||||
"apparently I don't understand what drain() does"
|
"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");
|
xous::return_scalar2(msg.sender, 0, 0).expect("couldn't return scalar");
|
||||||
is_mounted.store(true, Ordering::SeqCst);
|
is_mounted.store(true, Ordering::SeqCst);
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -871,7 +874,7 @@ fn wrapped_main() -> ! {
|
||||||
} else {
|
} else {
|
||||||
if !pddb_os.rootkeys_initialized() {
|
if !pddb_os.rootkeys_initialized() {
|
||||||
// can't mount if we have no root keys
|
// 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
|
// allow the main menu to be used in this case
|
||||||
let gam = gam::Gam::new(&xns).unwrap();
|
let gam = gam::Gam::new(&xns).unwrap();
|
||||||
gam.allow_mainmenu().expect("couldn't allow main menu activation");
|
gam.allow_mainmenu().expect("couldn't allow main menu activation");
|
||||||
|
|
@ -896,7 +899,7 @@ fn wrapped_main() -> ! {
|
||||||
mount_notifications.len() == 0,
|
mount_notifications.len() == 0,
|
||||||
"apparently I don't understand what drain() does"
|
"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");
|
xous::return_scalar2(msg.sender, 0, 0).expect("couldn't return scalar");
|
||||||
} else {
|
} else {
|
||||||
xous::return_scalar2(msg.sender, 1, 0).expect("couldn't return scalar");
|
xous::return_scalar2(msg.sender, 1, 0).expect("couldn't return scalar");
|
||||||
|
|
@ -919,7 +922,7 @@ fn wrapped_main() -> ! {
|
||||||
mount_notifications.len() == 0,
|
mount_notifications.len() == 0,
|
||||||
"apparently I don't understand what drain() does"
|
"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");
|
xous::return_scalar2(msg.sender, 0, 0).expect("couldn't return scalar");
|
||||||
is_mounted.store(true, Ordering::SeqCst);
|
is_mounted.store(true, Ordering::SeqCst);
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -1093,9 +1096,9 @@ fn wrapped_main() -> ! {
|
||||||
Ok(_) => {
|
Ok(_) => {
|
||||||
log::info!(
|
log::info!(
|
||||||
"{}PDDB.CREATEOK,{},{}",
|
"{}PDDB.CREATEOK,{},{}",
|
||||||
xous::BOOKEND_START,
|
BOOKEND_START,
|
||||||
mgmt.name.as_str(),
|
mgmt.name.as_str(),
|
||||||
xous::BOOKEND_END
|
BOOKEND_END
|
||||||
);
|
);
|
||||||
mgmt.code = PddbRequestCode::NoErr
|
mgmt.code = PddbRequestCode::NoErr
|
||||||
}
|
}
|
||||||
|
|
@ -1169,9 +1172,9 @@ fn wrapped_main() -> ! {
|
||||||
finished = true;
|
finished = true;
|
||||||
log::info!(
|
log::info!(
|
||||||
"{}PDDB.UNLOCKOK,{},{}",
|
"{}PDDB.UNLOCKOK,{},{}",
|
||||||
xous::BOOKEND_START,
|
BOOKEND_START,
|
||||||
mgmt.name.as_str(),
|
mgmt.name.as_str(),
|
||||||
xous::BOOKEND_END
|
BOOKEND_END
|
||||||
);
|
);
|
||||||
if basis_monitor_notifications.len() > 0 {
|
if basis_monitor_notifications.len() > 0 {
|
||||||
notify_basis_change(
|
notify_basis_change(
|
||||||
|
|
@ -1183,9 +1186,9 @@ fn wrapped_main() -> ! {
|
||||||
} else {
|
} else {
|
||||||
log::info!(
|
log::info!(
|
||||||
"{}PDDB.BADPASS,{},{}",
|
"{}PDDB.BADPASS,{},{}",
|
||||||
xous::BOOKEND_START,
|
BOOKEND_START,
|
||||||
mgmt.name.as_str(),
|
mgmt.name.as_str(),
|
||||||
xous::BOOKEND_END
|
BOOKEND_END
|
||||||
);
|
);
|
||||||
modals
|
modals
|
||||||
.add_list_item(t!("pddb.yes", locales::LANG))
|
.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::Correct => return PasswordState::Correct,
|
||||||
PasswordState::Incorrect(failcount) => {
|
PasswordState::Incorrect(failcount) => {
|
||||||
pddb_os.clear_password(); // clear the bad password entry
|
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 {
|
if failcount % 3 == 0 {
|
||||||
// every three failures kick the failure back up the stack
|
// every three failures kick the failure back up the stack
|
||||||
return PasswordState::ForcedAbort(failcount);
|
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.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");
|
modals.add_list_item(t!("pddb.cancel", locales::LANG)).expect("couldn't build radio item list");
|
||||||
let do_format: bool;
|
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)) {
|
match modals.get_radiobutton(t!("pddb.requestformat", locales::LANG)) {
|
||||||
Ok(response) => {
|
Ok(response) => {
|
||||||
if response.as_str() == t!("pddb.okay", locales::LANG) {
|
if response.as_str() == t!("pddb.okay", locales::LANG) {
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
use gam::modal::*;
|
use gam::modal::*;
|
||||||
use locales::t;
|
use locales::t;
|
||||||
use num_traits::*;
|
use num_traits::*;
|
||||||
|
use precursor_hal::board::*;
|
||||||
use xous::msg_scalar_unpack;
|
use xous::msg_scalar_unpack;
|
||||||
use xous::{CID, SID};
|
use xous::{CID, SID};
|
||||||
use xous_ipc::Buffer;
|
use xous_ipc::Buffer;
|
||||||
|
|
@ -110,7 +111,7 @@ pub(crate) fn password_ux_manager(
|
||||||
false,
|
false,
|
||||||
None,
|
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();
|
pddb_modal.activate();
|
||||||
dr = Some(msg);
|
dr = Some(msg);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue