From 527f256ec127727b77195c6451a08a4acfd028a7 Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 26 Mar 2026 02:12:11 +0800 Subject: [PATCH] add API call to determine if in developer mode --- libs/keystore-api/src/gen2_api.rs | 1 + services/keystore/src/lib.rs | 16 ++++++++++++++++ services/keystore/src/platform/baosec/server.rs | 5 +++++ services/keystore/src/platform/baosec/store.rs | 2 ++ 4 files changed, 24 insertions(+) diff --git a/libs/keystore-api/src/gen2_api.rs b/libs/keystore-api/src/gen2_api.rs index 290c60e63..b26442c9d 100644 --- a/libs/keystore-api/src/gen2_api.rs +++ b/libs/keystore-api/src/gen2_api.rs @@ -21,6 +21,7 @@ pub enum Opcode { // ----- below are non-cryptographic opcodes but used to manipulate sensitive state ----- /// Set bootwait parameters Bootwait = 4096, + IsDeveloper = 4097, /// Used to map unknown opcodes InvalidCall = 65535, diff --git a/services/keystore/src/lib.rs b/services/keystore/src/lib.rs index b6d21b325..3075fc016 100644 --- a/services/keystore/src/lib.rs +++ b/services/keystore/src/lib.rs @@ -192,6 +192,22 @@ impl Keystore { _ => unimplemented!(), } } + + pub fn is_developer(&self) -> Result { + match xous::send_message( + self.conn, + xous::Message::new_blocking_scalar(Opcode::IsDeveloper.to_usize().unwrap(), 0, 0, 0, 0), + )? { + xous::Result::Scalar5(_, is_developer, _, _, _) => { + if is_developer == 0 { + Ok(true) + } else { + Ok(false) + } + } + _ => unimplemented!(), + } + } } use core::sync::atomic::{AtomicU32, Ordering}; diff --git a/services/keystore/src/platform/baosec/server.rs b/services/keystore/src/platform/baosec/server.rs index 3a3618216..2e25826d6 100644 --- a/services/keystore/src/platform/baosec/server.rs +++ b/services/keystore/src/platform/baosec/server.rs @@ -72,6 +72,11 @@ pub fn keystore(sid: SID) -> ! { } } } + Opcode::IsDeveloper => { + if let Some(scalar) = msg.body.scalar_message_mut() { + if store.is_developer() { scalar.arg1 = 0 } else { scalar.arg1 = 1 } + } + } Opcode::InvalidCall => { log::error!("Invalid call in keystore: {:?}", opcode); } diff --git a/services/keystore/src/platform/baosec/store.rs b/services/keystore/src/platform/baosec/store.rs index 3e1b1ec36..942cbb6eb 100644 --- a/services/keystore/src/platform/baosec/store.rs +++ b/services/keystore/src/platform/baosec/store.rs @@ -384,4 +384,6 @@ impl KeyStore { BootWaitCoding::Disable => Ok(false), } } + + pub fn is_developer(&self) -> bool { self.owc.get(bao1x_api::DEVELOPER_MODE).unwrap() != 0 } }