From 137c70a629acd37b2a6052ec2b7a10725115947a Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 4 Nov 2025 13:15:28 +0800 Subject: [PATCH] add routines for manipulating and using the serial numbers in boot1 context --- .../boot1/src/platform/bao1x/usb/handlers.rs | 5 ++++- .../boot1/src/platform/bao1x/usb/mod.rs | 2 -- bao1x-boot/boot1/src/repl.rs | 22 ++++++++++++++++++- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/bao1x-boot/boot1/src/platform/bao1x/usb/handlers.rs b/bao1x-boot/boot1/src/platform/bao1x/usb/handlers.rs index 1fc7baf5c..277856cc2 100644 --- a/bao1x-boot/boot1/src/platform/bao1x/usb/handlers.rs +++ b/bao1x-boot/boot1/src/platform/bao1x/usb/handlers.rs @@ -126,10 +126,13 @@ pub fn get_descriptor_request(this: &mut CorigineUsb, value: u16, _index: usize, ep0_buf[..4].copy_from_slice(&[4, USB_DT_STRING, 9, 4]); 4 } else { + let owc = bao1x_hal::acram::OneWayCounter::new(); + let slot_mgr = bao1x_hal::acram::SlotManager::new(); + let sn = bao1x_hal::usb::derive_usb_serial_number(&owc, &slot_mgr); let s = match id { 1 => MANUFACTURER, 2 => PRODUCT, - _ => SERIAL, + _ => &sn, }; let slen = 2 + s.len() * 2; ep0_buf[0] = slen as u8; diff --git a/bao1x-boot/boot1/src/platform/bao1x/usb/mod.rs b/bao1x-boot/boot1/src/platform/bao1x/usb/mod.rs index 4143e5138..b7d0a953c 100644 --- a/bao1x-boot/boot1/src/platform/bao1x/usb/mod.rs +++ b/bao1x-boot/boot1/src/platform/bao1x/usb/mod.rs @@ -136,8 +136,6 @@ const VENDOR_ID: u16 = 0x1209; const PRODUCT_ID: u16 = 0x3613; // this needs to change! this is the Precursor product ID. const MANUFACTURER: &'static str = "Baochip"; const PRODUCT: &'static str = "Dabao"; -// no seriously, do this -const SERIAL: &'static str = "TODO"; impl DeviceDescriptor { #[allow(dead_code)] diff --git a/bao1x-boot/boot1/src/repl.rs b/bao1x-boot/boot1/src/repl.rs index 6a33ff48d..01b849333 100644 --- a/bao1x-boot/boot1/src/repl.rs +++ b/bao1x-boot/boot1/src/repl.rs @@ -245,6 +245,22 @@ impl Repl { return Err(Error::help("altboot [toggle]")); } } + "idmode" => { + let owc = OneWayCounter::new(); + if args.len() == 0 { + crate::println!("ID mode is: {:?}", owc.get_decoded::()); + self.abort_cmd(); + return Ok(()); + } else if args.len() != 1 { + return Err(Error::help("idmode [toggle]")); + } + if args[0] == "toggle" { + owc.inc_coded::().unwrap(); + crate::println!("ID mode is now: {:?}", owc.get_decoded::()); + } else { + return Err(Error::help("idmode [toggle]")); + } + } "audit" => { let owc = OneWayCounter::new(); let boardtype = owc.get_decoded::().unwrap(); @@ -261,6 +277,10 @@ impl Repl { u32::from_le_bytes(sn[4..8].try_into().unwrap()), u32::from_le_bytes(sn[..4].try_into().unwrap()) ); + crate::println!( + "Public serial number: {}", + bao1x_hal::usb::derive_usb_serial_number(&owc, &slot_mgr) + ); crate::println!("Revocations:"); crate::println!("Stage key0 key1 key2 key3"); let key_array = [ @@ -517,7 +537,7 @@ impl Repl { _ => { crate::println!("Command not recognized: {}", cmd); crate::print!( - "Commands include: reset, echo, altboot, boot, bootwait, localecho, uf2, boardtype, audit, lockdown" + "Commands include: reset, echo, altboot, boot, bootwait, idmode, localecho, uf2, boardtype, audit, lockdown" ); #[cfg(feature = "test-boot0-keys")] crate::print!(", publock");