Skip to content

Bootloader logic minor fix #253

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
424778940z merged 1 commit into from
Feb 14, 2025
Merged

Bootloader logic minor fix #253

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions core/embed/bootloader/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,6 +603,13 @@ static BOOT_TARGET decide_boot_target(vendor_header* const vhdr,
BOOT_TARGET boot_target = *BOOT_TARGET_FLAG_ADDR; // cache flag
*BOOT_TARGET_FLAG_ADDR = BOOT_TARGET_NORMAL; // consume(reset) flag

// verify at the beginning to ensure results are populated
char err_msg[64];
set_handle_flash_ecc_error(sectrue);
secbool all_good = verify_firmware(vhdr, hdr, vhdr_valid, hdr_valid,
code_valid, err_msg, sizeof(err_msg));
set_handle_flash_ecc_error(secfalse);

// if boot target already set to this level, no more checks
if (boot_target == BOOT_TARGET_BOOTLOADER) return boot_target;

Expand All @@ -619,13 +626,6 @@ static BOOT_TARGET decide_boot_target(vendor_header* const vhdr,
}

// check firmware
char err_msg[64];

set_handle_flash_ecc_error(sectrue);
secbool all_good = verify_firmware(vhdr, hdr, vhdr_valid, hdr_valid,
code_valid, err_msg, sizeof(err_msg));
set_handle_flash_ecc_error(secfalse);

if (all_good != sectrue) {
boot_target = BOOT_TARGET_BOOTLOADER;
return boot_target;
Expand Down
Loading