diff --git a/services/shellchat/Cargo.toml b/services/shellchat/Cargo.toml index 002eb9b3c..e669103c1 100644 --- a/services/shellchat/Cargo.toml +++ b/services/shellchat/Cargo.toml @@ -31,6 +31,7 @@ aes = { path = "../aes" } cipher = "0.4.4" spinor = { path = "../spinor" } root-keys = { path = "../root-keys" } +keystore-api = { path = "../../libs/keystore-api", features = ["gen1"] } jtag = { path = "../jtag" } net = { path = "../net" } dns = { path = "../dns" } diff --git a/services/shellchat/src/cmds/keys.rs b/services/shellchat/src/cmds/keys.rs index 369291532..81df05caa 100644 --- a/services/shellchat/src/cmds/keys.rs +++ b/services/shellchat/src/cmds/keys.rs @@ -1,5 +1,5 @@ use String; -use root_keys::api::{AesRootkeyType, Block}; +use keystore_api::rootkeys_api::{AesRootkeyType, Block}; use crate::{CommonEnv, ShellCmdApi}; diff --git a/services/status/Cargo.toml b/services/status/Cargo.toml index 88bb940c7..e69a753fb 100644 --- a/services/status/Cargo.toml +++ b/services/status/Cargo.toml @@ -22,6 +22,7 @@ gam = { path = "../gam" } locales = { path = "../../locales" } susres = { package = "xous-api-susres", version = "0.9.63" } root-keys = { path = "../root-keys" } +keystore-api = { path = "../../libs/keystore-api", features = ["gen1"] } modals = { path = "../modals" } pddb = { path = "../pddb" } net = { path = "../net" } diff --git a/services/status/src/main.rs b/services/status/src/main.rs index 36baea78d..436b15cf5 100644 --- a/services/status/src/main.rs +++ b/services/status/src/main.rs @@ -24,9 +24,9 @@ use chrono::prelude::*; use com::api::*; use crossbeam::channel::{Receiver, Sender, at, select, unbounded}; use gam::{GamObjectList, GamObjectType}; +use keystore_api::rootkeys_api::{BackupKeyboardLayout, BackupOp}; use locales::t; use num_traits::*; -use root_keys::api::{BackupKeyboardLayout, BackupOp}; use ux_api::minigfx::*; use ux_api::service::api::*; use xous::{CID, Message, msg_scalar_unpack, send_message}; @@ -655,7 +655,7 @@ fn wrapped_main() -> ! { .expect("couldn't exit the gutter server"); gutter.join().expect("status boot gutter server did not exit gracefully"); // allocate some storage for backup checksums - let checksums: Arc>> = Arc::new(Mutex::new(None)); + let checksums: Arc>> = Arc::new(Mutex::new(None)); // --------------------------- graphical loop timing let mut stats_phase: usize = 0; @@ -1590,7 +1590,7 @@ fn wrapped_main() -> ! { }); } Some(StatusOpcode::PrepareBackupPhase2) => { - let mut metadata = root_keys::api::BackupHeader::default(); + let mut metadata = keystore_api::rootkeys_api::BackupHeader::default(); // note: default() should set the language correctly by default since it's a systemwide // constant metadata.timestamp = localtime.get_local_time_ms().unwrap_or(0);