diff --git a/bao1x-boot/boot1/src/main.rs b/bao1x-boot/boot1/src/main.rs index f365ff07f..fba0cd919 100644 --- a/bao1x-boot/boot1/src/main.rs +++ b/bao1x-boot/boot1/src/main.rs @@ -154,11 +154,11 @@ pub unsafe extern "C" fn rust_entry() -> ! { // So, what alpha users miss out on is the half of the states set up & checked by boot0 in the beta+ // firmwares. bao1x_hal::hardening::mesh_check_and_react(&mut csprng, &one_way); - bollard!(4); + bollard!(die, 4); // Mesh check takes 100ms for the signal to propagate. Setup the mesh check here, then check the // result in loader. This is the opposite polarity of what was checked in boot0. mesh_setup(true, None); - bollard!(4); + bollard!(die, 4); // This checks the attack counter and applies a reaction policy. This is done in boot1 so that it // has a chance to be updated. bao1x_hal::hardening::apply_attack_policy(&mut csprng, &one_way); diff --git a/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs b/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs index 0a10f3026..b95b2cbf7 100644 --- a/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs +++ b/bao1x-boot/boot1/src/platform/bao1x/bao1x.rs @@ -509,7 +509,9 @@ mod panic_handler { fn handle_panic(_arg: &PanicInfo) -> ! { USB_CONNECTED.store(false, core::sync::atomic::Ordering::SeqCst); crate::println!("{}", _arg); - loop {} + loop { + bao1x_hal::sigcheck::die_no_std(); + } } }