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

fix(core): fix bootloader_ci production build

Browse Source 
[no changelog]
This commit is contained in:
tychovrahe 2024-09-17 16:48:23 +02:00 committed by TychoVrahe
parent fbbbd317c3
commit 02533aa27a
4 changed files with 7 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/SConscript.bootloader_ci
View File

@ -160,6 +160,7 @@ SOURCE_BOOTLOADER = [
'embed/bootloader_ci/main.c', 'embed/bootloader_ci/main.c',
'embed/bootloader_ci/messages.c', 'embed/bootloader_ci/messages.c',
'embed/bootloader_ci/protob/messages.pb.c', 'embed/bootloader_ci/protob/messages.pb.c',
'embed/bootloader_ci/version_check.c',
] ]
env.Replace( env.Replace(

34
core/embed/bootloader_ci/main.c
View File

@ -40,6 +40,7 @@
#include "bootui.h" #include "bootui.h"
#include "messages.h" #include "messages.h"
#include "model.h" #include "model.h"
#include "version_check.h"
#ifdef USE_HASH_PROCESSOR #ifdef USE_HASH_PROCESSOR
#include "hash_processor.h" #include "hash_processor.h"
@ -174,34 +175,6 @@ static secbool check_vendor_header_lock(const vendor_header *const vhdr) {
return sectrue * (0 == memcmp(lock, hash, 32)); return sectrue * (0 == memcmp(lock, hash, 32));
} }
// protection against bootloader downgrade
#if PRODUCTION
static void check_bootloader_version(void) {
uint8_t bits[FLASH_OTP_BLOCK_SIZE];
for (int i = 0; i < FLASH_OTP_BLOCK_SIZE * 8; i++) {
if (i < VERSION_MONOTONIC) {
bits[i / 8] &= ~(1 << (7 - (i % 8)));
} else {
bits[i / 8] |= (1 << (7 - (i % 8)));
}
}
ensure(flash_otp_write(FLASH_OTP_BLOCK_BOOTLOADER_VERSION, 0, bits,
FLASH_OTP_BLOCK_SIZE),
NULL);
uint8_t bits2[FLASH_OTP_BLOCK_SIZE];
ensure(flash_otp_read(FLASH_OTP_BLOCK_BOOTLOADER_VERSION, 0, bits2,
FLASH_OTP_BLOCK_SIZE),
NULL);
ensure(sectrue * (0 == memcmp(bits, bits2, FLASH_OTP_BLOCK_SIZE)),
"Bootloader downgraded");
}
#endif
int main(void) { int main(void) {
random_delays_init(); random_delays_init();
#ifdef USE_TOUCH #ifdef USE_TOUCH
@ -214,8 +187,9 @@ int main(void) {
mpu_config_bootloader(); mpu_config_bootloader();
#if PRODUCTION #if PRODUCTION && !defined STM32U5
check_bootloader_version(); // for STM32U5, this check is moved to boardloader
ensure_bootloader_min_version();
#endif #endif
display_clear(); display_clear();

1
core/embed/bootloader_ci/version_check.c Symbolic link
View File

@ -0,0 +1 @@
../bootloader/version_check.c

1
core/embed/bootloader_ci/version_check.h Symbolic link
View File

@ -0,0 +1 @@
../bootloader/version_check.h