arno/trezor-firmware
1
0
Fork 0
mirror of https://github.com/trezor/trezor-firmware.git synced 2025-01-03 12:00:59 +00:00
Code Issues Releases Wiki Activity

fix(core/bootloader): fix unlocking bootloader granting HDP access on U5

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2024-09-05 16:28:28 +02:00 committed by TychoVrahe
parent 422b376ebd
commit be9255ae04
3 changed files with 47 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,9 @@ secbool secret_optiga_get(uint8_t dest[SECRET_OPTIGA_KEY_LEN]);
// Checks if the optiga pairing secret is present in the secret storage // Checks if the optiga pairing secret is present in the secret storage
secbool secret_optiga_present(void); secbool secret_optiga_present(void);
// Checks if the optiga pairing secret can be written to the secret storage
secbool secret_optiga_writable(void);
// Erases optiga pairing secret from the secret storage // Erases optiga pairing secret from the secret storage
void secret_optiga_erase(void); void secret_optiga_erase(void);

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

@ -102,6 +102,8 @@ secbool secret_optiga_present(void) {
return (sectrue != secret_wiped()) * sectrue; return (sectrue != secret_wiped()) * sectrue;
} }
secbool secret_optiga_writable(void) { return secret_wiped(); }
void secret_optiga_erase(void) { secret_erase(); } void secret_optiga_erase(void) { secret_erase(); }
void secret_prepare_fw(secbool allow_run_with_secret, secbool _trust_all) { void secret_prepare_fw(secbool allow_run_with_secret, secbool _trust_all) {

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

@ -176,6 +176,29 @@ secbool secret_optiga_present(void) {
return secret_present(SECRET_OPTIGA_KEY_OFFSET, SECRET_OPTIGA_KEY_LEN); return secret_present(SECRET_OPTIGA_KEY_OFFSET, SECRET_OPTIGA_KEY_LEN);
} }
secbool secret_optiga_writable(void) {
const uint32_t offset = SECRET_OPTIGA_KEY_OFFSET;
const uint32_t len = SECRET_OPTIGA_KEY_LEN;
const uint8_t *const secret =
(uint8_t *)flash_area_get_address(&SECRET_AREA, offset, len);
if (secret == NULL) {
return secfalse;
}
int secret_empty_bytes = 0;
for (int i = 0; i < len; i++) {
// 0xFF being the default value of the flash memory (before any write)
// 0x00 being the value of the flash memory after manual erase
if (secret[i] == 0xFF) {
secret_empty_bytes++;
}
}
return sectrue * (secret_empty_bytes == len);
}
// Backs up the optiga pairing secret from the secret storage to the backup // Backs up the optiga pairing secret from the secret storage to the backup
// register // register
static void secret_optiga_cache(void) { static void secret_optiga_cache(void) {
@ -270,16 +293,25 @@ void secret_prepare_fw(secbool allow_run_with_secret, secbool trust_all) {
secret_bhk_lock(); secret_bhk_lock();
#ifdef USE_OPTIGA #ifdef USE_OPTIGA
secret_optiga_uncache(); secret_optiga_uncache();
if (sectrue == allow_run_with_secret) { secbool optiga_secret_present = secret_optiga_present();
if (secfalse != secret_optiga_present()) { secbool optiga_secret_writable = secret_optiga_writable();
secret_optiga_cache(); if (sectrue == trust_all && sectrue == allow_run_with_secret &&
secret_disable_access(); sectrue == optiga_secret_writable && secfalse == optiga_secret_present) {
} // Secret is not present and the secret sector is writable.
} else { // This means the U5 chip is unprovisioned.
if (secfalse != secret_optiga_present()) { // Allow trusted firmware (prodtest presumably) to access the secret sector,
show_install_restricted_screen(); // early return here.
} return;
secret_disable_access(); }
if (sectrue == allow_run_with_secret && sectrue == optiga_secret_present) {
// Firmware is trusted and the Optiga secret is present, make it available.
secret_optiga_cache();
}
// Disable access unconditionally.
secret_disable_access();
if (sectrue != trust_all && sectrue == optiga_secret_present) {
// Untrusted firmware, locked bootloader. Show the restricted screen.
show_install_restricted_screen();
} }
#else #else
secret_disable_access(); secret_disable_access();