From 36b103ef6cd2cd29f85294c696981315d4e39507 Mon Sep 17 00:00:00 2001 From: bunnie Date: Fri, 19 Dec 2025 01:09:44 +0800 Subject: [PATCH] remove the developer function from the function code list The developer function was decided to be overly-broad: the issue is you could slot that in to *any* boot position and it'd be accepted, and we already have a mechanism to deal with developer mode (developer-signed images). Thus eliminate the extra case and simplify the code base to reduce potential bugs. --- libs/bao1x-api/src/pubkeys/mod.rs | 19 +++---------------- libs/bao1x-api/src/signatures.rs | 2 -- tools/src/sign_image.rs | 3 ++- 3 files changed, 5 insertions(+), 19 deletions(-) diff --git a/libs/bao1x-api/src/pubkeys/mod.rs b/libs/bao1x-api/src/pubkeys/mod.rs index c74b43f6e..a89dd1651 100644 --- a/libs/bao1x-api/src/pubkeys/mod.rs +++ b/libs/bao1x-api/src/pubkeys/mod.rs @@ -68,11 +68,7 @@ pub const BOOT0_TO_BOOT1: SecurityConfiguration = SecurityConfiguration { image_ptr: crate::BOOT1_START as *const u32, pubkey_ptr: crate::BOOT0_START as *const u32, revocation_owc: crate::BOOT0_REVOCATION_OFFSET, - function_codes: &[ - FunctionCode::Boot1 as u32, - FunctionCode::UpdatedBoot1 as u32, - FunctionCode::Developer as u32, - ], + function_codes: &[FunctionCode::Boot1 as u32, FunctionCode::UpdatedBoot1 as u32], }; /// This is different from a jump directly to loader/baremetal because the @@ -81,11 +77,7 @@ pub const BOOT0_TO_ALTBOOT1: SecurityConfiguration = SecurityConfiguration { image_ptr: crate::LOADER_START as *const u32, pubkey_ptr: crate::BOOT0_START as *const u32, revocation_owc: crate::BOOT0_REVOCATION_OFFSET, - function_codes: &[ - FunctionCode::Boot1 as u32, - FunctionCode::UpdatedBoot1 as u32, - FunctionCode::Developer as u32, - ], + function_codes: &[FunctionCode::Boot1 as u32, FunctionCode::UpdatedBoot1 as u32], }; pub const BOOT1_TO_LOADER_OR_BAREMETAL: SecurityConfiguration = SecurityConfiguration { @@ -97,7 +89,6 @@ pub const BOOT1_TO_LOADER_OR_BAREMETAL: SecurityConfiguration = SecurityConfigur FunctionCode::UpdatedBaremetal as u32, FunctionCode::Loader as u32, FunctionCode::UpdatedLoader as u32, - FunctionCode::Developer as u32, ], }; @@ -105,11 +96,7 @@ pub const LOADER_TO_KERNEL: SecurityConfiguration = SecurityConfiguration { image_ptr: crate::KERNEL_START as *const u32, pubkey_ptr: crate::LOADER_START as *const u32, revocation_owc: crate::LOADER_REVOCATION_OFFSET, - function_codes: &[ - FunctionCode::Kernel as u32, - FunctionCode::UpdatedKernel as u32, - FunctionCode::Developer as u32, - ], + function_codes: &[FunctionCode::Kernel as u32, FunctionCode::UpdatedKernel as u32], }; pub const LOADER_TO_DETACHED_APP: SecurityConfiguration = SecurityConfiguration { diff --git a/libs/bao1x-api/src/signatures.rs b/libs/bao1x-api/src/signatures.rs index adcf9869c..191337446 100644 --- a/libs/bao1x-api/src/signatures.rs +++ b/libs/bao1x-api/src/signatures.rs @@ -39,8 +39,6 @@ pub enum FunctionCode { /// Application region App = 0x10_0000, UpdatedApp = 0x10_0001, - /// Developer use - can go in any region, but only usable with secrets wiped. - Developer = 0x1000_0000, } pub const BAOCHIP_SIG_VERSION: u32 = 0x1_00; diff --git a/tools/src/sign_image.rs b/tools/src/sign_image.rs index ebe04aec1..02f31251f 100644 --- a/tools/src/sign_image.rs +++ b/tools/src/sign_image.rs @@ -211,7 +211,8 @@ pub fn sign_image( Some("kernel") => FunctionCode::Kernel, Some("app") => FunctionCode::App, Some("swap") => FunctionCode::Swap, - _ => FunctionCode::Developer, + Some("baremetal") => FunctionCode::Baremetal, + _ => panic!("Invalid function code"), }; let mut header = SignatureInFlash::default(); header.sealed_data.version = version as u32;