arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-09 06:50:58 +00:00
Code Issues Releases Wiki Activity

fix(core): reboot immediately in boardloader if BHK is locked

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2024-09-25 16:40:47 +02:00 committed by TychoVrahe
parent 454b8140ec
commit 2530312091
4 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/embed/boardloader/main.c
View File

@ -34,6 +34,7 @@
#include "mpu.h" #include "mpu.h"
#include "rng.h" #include "rng.h"
#include "rsod.h" #include "rsod.h"
#include "secret.h"
#include "system.h" #include "system.h"
#include "terminal.h" #include "terminal.h"
@ -63,7 +64,6 @@
#include "memzero.h" #include "memzero.h"
#ifdef STM32U5 #ifdef STM32U5
#include "secret.h"
#include "tamper.h" #include "tamper.h"
#include "trustzone.h" #include "trustzone.h"
#endif #endif
@ -253,10 +253,10 @@ int main(void) {
tamper_init(); tamper_init();
trustzone_init_boardloader(); trustzone_init_boardloader();
secret_ensure_initialized();
#endif #endif
secret_init();
#ifdef STM32F4 #ifdef STM32F4
clear_otg_hs_memory(); clear_otg_hs_memory();
#endif #endif

8
core/embed/trezorhal/secret.h
View File

@ -30,9 +30,6 @@ secbool secret_wiped(void);
// Verifies that the secret storage has correct header // Verifies that the secret storage has correct header
secbool secret_verify_header(void); secbool secret_verify_header(void);
// Checks that the secret storage is initialized and initializes it if not
secbool secret_ensure_initialized(void);
// Erases the entire secret storage // Erases the entire secret storage
void secret_erase(void); void secret_erase(void);
@ -70,6 +67,11 @@ void secret_bhk_regenerate(void);
// This function is called by the bootloader before starting the firmware // This function is called by the bootloader before starting the firmware
void secret_prepare_fw(secbool allow_run_with_secret, secbool trust_all); void secret_prepare_fw(secbool allow_run_with_secret, secbool trust_all);
// Prepares the secret storage for running the boardloader and next stages
// Ensures that secret storage access is enabled
// This function is called by the boardloader
void secret_init(void);
#endif // KERNEL_MODE #endif // KERNEL_MODE
// Checks if bootloader is locked, that is the secret storage contains optiga // Checks if bootloader is locked, that is the secret storage contains optiga

2
core/embed/trezorhal/stm32f4/secret.c
View File

@ -133,4 +133,6 @@ void secret_prepare_fw(secbool allow_run_with_secret, secbool _trust_all) {
#endif #endif
} }
void secret_init(void) {}
#endif // KERNEL_MODE #endif // KERNEL_MODE

10
core/embed/trezorhal/stm32u5/secret.c
View File

@ -35,7 +35,7 @@ secbool secret_verify_header(void) {
return bootloader_locked; return bootloader_locked;
} }
secbool secret_ensure_initialized(void) { static secbool secret_ensure_initialized(void) {
if (sectrue != secret_verify_header()) { if (sectrue != secret_verify_header()) {
ensure(erase_storage(NULL), "erase storage failed"); ensure(erase_storage(NULL), "erase storage failed");
secret_erase(); secret_erase();
@ -353,4 +353,12 @@ void secret_prepare_fw(secbool allow_run_with_secret, secbool trust_all) {
} }
} }
void secret_init(void) {
if (secret_bhk_locked() == sectrue) {
reboot();
}
secret_ensure_initialized();
}
#endif // KERNEL_MODE #endif // KERNEL_MODE