Merge remote-tracking branch 'agent/benma-agent/stage0-randomness-backup'
What changed, and why it matters
This commit updates the BitBox02 hardware wallet's earliest boot code (stage0 bootloader) to version 3. The main change moves a backup copy of the factory-generated randomness out of the main firmware flash area and into a dedicated scratch region. Previously, that backup sat inside the firmware update area, so a firmware update could accidentally overwrite or corrupt it. The change is a defensive hardening fix: it preserves a secret used during bootloader updates and reduces the chance that a firmware update could break the device's ability to update the bootloader or boot securely.
Treat this as a security-hardening fix and include it in the next firmware release. Users should update to a firmware release containing stage0 v3 once available. Manufacturers and developers should verify that the new prebuilt stage0 v3 binaries match the published checksums and that the scratch-region layout assertions pass for their build configuration.
Security signals we found
Memory-layout change to isolate a secret backup from firmware update area
Removal of old backup address macros and addition of new FLASH_SCRATCH region
Linker assertions tightened to prevent overlap between upgrade code/data and embedded stage1 payload
Compile-time static asserts added for scratch-region alignment and non-overlap with bootdata/SmartEEPROM/stage1 slot
Unit tests extended to deny flash page/block access to app, bootdata, and SmartEEPROM regions
Stage0 bootloader binaries regenerated and checksummed (v1 -> v3)
CHANGELOG describes the change as preserving firmware integrity during stage1 updates
Evidence from the diff
The patch relocates the factory-randomness backup from BB02_STAGE1_FACTORY_RANDOM_BACKUP_ADDR (0x000D8000, inside the firmware/bootloader_upgrade ROM region) to a new FLASH_SCRATCH_START region (0x000FA000, above boot data and below SmartEEPROM). It bumps stage0 from v1 binaries to v3 binaries, expands the bootloader-upgrade ROM length, updates linker assertions so the upgrade ROM no longer overlaps the old backup slot, and adds compile-time checks ensuring the scratch region does not overlap bootdata, SmartEEPROM, or the stage1 update slot. Unit tests are updated to reject page/block writes to application, bootdata, and SmartEEPROM regions. The changelog explicitly frames the change as preserving firmware integrity during stage1 updates.
Changed components
BitBox02 / BitBox02 Nova stage0 bootloaderbootloader upgrade memory layout (firmware-blupgrade.ld)factory randomness backup storagestage0 flash read/write/erase access-control helpersbootloader_upgrade.h / flags.h memory map definitionsprebuilt stage0 v3 binaries for all device variantsInspect captured patch +89 / −52
### CHANGELOG.md
@@ -264,4 +264,10 @@ recorded separately.
## Stage0 bootloader
### Unreleased
+
+### v3
+- Move the factory randomness backup out of the firmware area to preserve firmware integrity
+ during stage1 updates.
+
+### v2
- Hold the screen reset pin low until bootloader is ready to initalize it.
### firmware-blupgrade.ld
@@ -4,15 +4,14 @@ SEARCH_DIR(.)
MEMORY
{
- rom (rx) : ORIGIN = 0x00010000, LENGTH = 0x000C7000
+ rom (rx) : ORIGIN = 0x00010000, LENGTH = 0x000CB000
bootloader_update (rx) : ORIGIN = 0x000DB000, LENGTH = 0x0000C000
ram (rwx) : ORIGIN = 0x20000200, LENGTH = 0x0003FE00
bkupram (rwx) : ORIGIN = 0x47000000, LENGTH = 0x00002000
qspi (rwx) : ORIGIN = 0x04000000, LENGTH = 0x01000000
}
-ASSERT(ORIGIN(rom) + LENGTH(rom) <= 0x000D8000, "blupgrade rom overlaps factory randomness backup slot")
-ASSERT(ORIGIN(bootloader_update) >= 0x000DA000, "bootloader update slot overlaps factory randomness backup slot")
+ASSERT(ORIGIN(rom) + LENGTH(rom) <= ORIGIN(bootloader_update), "blupgrade code/data overlaps embedded stage1 payload")
STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : DEFINED(__stack_size__) ? __stack_size__ : 0x10000;
HEAP_SIZE = DEFINED(HEAP_SIZE) ? HEAP_SIZE : DEFINED(__heap_size__) ? __heap_size__ : 0x10000;
### src/CMakeLists.txt
@@ -471,14 +471,14 @@ if(CMAKE_CROSSCOMPILING)
target_sources(factory-setup.elf PRIVATE ${PLATFORM-BITBOX02-SOURCES})
set(BB02_BLUPD_BIN_DIR ${CMAKE_SOURCE_DIR}/src/bootloader_upgrade/bin)
- set(BB02_BLUPD_STAGE0_BITBOX02_BTCONLY_PRODUCTION_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02-btconly-production.v1.bin)
- set(BB02_BLUPD_STAGE0_BITBOX02_MULTI_PRODUCTION_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02-multi-production.v1.bin)
- set(BB02_BLUPD_STAGE0_BITBOX02NOVA_BTCONLY_PRODUCTION_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02nova-btconly-production.v1.bin)
- set(BB02_BLUPD_STAGE0_BITBOX02NOVA_MULTI_PRODUCTION_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02nova-multi-production.v1.bin)
- set(BB02_BLUPD_STAGE0_BITBOX02_BTCONLY_DEVELOPMENT_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02-btconly-development.v1.bin)
- set(BB02_BLUPD_STAGE0_BITBOX02_MULTI_DEVELOPMENT_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02-multi-development.v1.bin)
- set(BB02_BLUPD_STAGE0_BITBOX02NOVA_BTCONLY_DEVELOPMENT_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02nova-btconly-development.v1.bin)
- set(BB02_BLUPD_STAGE0_BITBOX02NOVA_MULTI_DEVELOPMENT_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02nova-multi-development.v1.bin)
+ set(BB02_BLUPD_STAGE0_BITBOX02_BTCONLY_PRODUCTION_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02-btconly-production.v3.bin)
+ set(BB02_BLUPD_STAGE0_BITBOX02_MULTI_PRODUCTION_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02-multi-production.v3.bin)
+ set(BB02_BLUPD_STAGE0_BITBOX02NOVA_BTCONLY_PRODUCTION_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02nova-btconly-production.v3.bin)
+ set(BB02_BLUPD_STAGE0_BITBOX02NOVA_MULTI_PRODUCTION_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02nova-multi-production.v3.bin)
+ set(BB02_BLUPD_STAGE0_BITBOX02_BTCONLY_DEVELOPMENT_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02-btconly-development.v3.bin)
+ set(BB02_BLUPD_STAGE0_BITBOX02_MULTI_DEVELOPMENT_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02-multi-development.v3.bin)
+ set(BB02_BLUPD_STAGE0_BITBOX02NOVA_BTCONLY_DEVELOPMENT_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02nova-btconly-development.v3.bin)
+ set(BB02_BLUPD_STAGE0_BITBOX02NOVA_MULTI_DEVELOPMENT_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage0-bitbox02nova-multi-development.v3.bin)
set(BB02_BLUPD_STAGE1_BITBOX02_BTCONLY_PRODUCTION_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage1-bitbox02-btconly-production.v1.2.2.signed.bin)
set(BB02_BLUPD_STAGE1_BITBOX02_MULTI_PRODUCTION_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage1-bitbox02-multi-production.v1.2.2.signed.bin)
set(BB02_BLUPD_STAGE1_BITBOX02NOVA_BTCONLY_PRODUCTION_BIN ${BB02_BLUPD_BIN_DIR}/bootloader-stage1-bitbox02nova-btconly-production.v1.2.2.signed.bin)
### src/bootloader/stage0/stage0.c
@@ -350,24 +350,24 @@ static secbool_u32 _factory_random_backup_valid(
uint8_t factory_random_out[BB02_STAGE1_FACTORY_RANDOM_LEN])
{
return stage0_factory_random_backup_valid(
- (const stage0_factory_random_backup_t*)BB02_STAGE1_FACTORY_RANDOM_BACKUP_ADDR,
+ (const stage0_factory_random_backup_t*)STAGE0_FACTORY_RANDOM_BACKUP_ADDR,
factory_random_out);
}
static void _factory_random_backup_create(
const uint8_t factory_random[BB02_STAGE1_FACTORY_RANDOM_LEN],
const volatile secbool_u32* install_auth)
{
- if (_flash_block_erased(BB02_STAGE1_FACTORY_RANDOM_BACKUP_BLOCK_ADDR) != sectrue_u32) {
- _flash_erase_block(BB02_STAGE1_FACTORY_RANDOM_BACKUP_BLOCK_ADDR, install_auth);
+ if (_flash_block_erased(FLASH_SCRATCH_START) != sectrue_u32) {
+ _flash_erase_block(FLASH_SCRATCH_START, install_auth);
}
uint32_t page[STAGE0_FLASH_PAGE_WORDS];
stage0_factory_random_backup_make_data_page(page, factory_random);
- _flash_write_page(BB02_STAGE1_FACTORY_RANDOM_BACKUP_ADDR, page, install_auth);
+ _flash_write_page(STAGE0_FACTORY_RANDOM_BACKUP_ADDR, page, install_auth);
stage0_factory_random_backup_make_commit_page(page);
- _flash_write_page(BB02_STAGE1_FACTORY_RANDOM_BACKUP_ADDR, page, install_auth);
+ _flash_write_page(STAGE0_FACTORY_RANDOM_BACKUP_ADDR, page, install_auth);
uint8_t verify[BB02_STAGE1_FACTORY_RANDOM_LEN];
if (_factory_random_backup_valid(verify) != sectrue_u32 ||
@@ -491,7 +491,7 @@ static void _install_stage1(
uint32_t page[STAGE0_FLASH_PAGE_WORDS];
_nvm_disable_bootprot(install_auth);
- _flash_unlock_region(BB02_STAGE1_FACTORY_RANDOM_BACKUP_BLOCK_ADDR, install_auth);
+ _flash_unlock_region(FLASH_SCRATCH_START, install_auth);
_factory_random_load_or_create_backup(factory_random, installed_header_ok, install_auth);
_flash_unlock_region(0x00000000U, install_auth);
_flash_unlock_region(0x00008000U, install_auth);
### src/bootloader/stage0/stage0_flash.h
@@ -4,6 +4,7 @@
#define _STAGE0_FLASH_H_
#include "bootloader_upgrade/bootloader_upgrade.h"
+#include "flags.h"
#include "util.h"
#include <stddef.h>
@@ -21,6 +22,7 @@
#define STAGE0_STAGE1_FACTORY_RANDOM_BLOCK_ADDR \
(BB02_STAGE1_FACTORY_RANDOM_ADDR & ~(STAGE0_FLASH_BLOCK_SIZE_BYTES - 1U))
+#define STAGE0_FACTORY_RANDOM_BACKUP_ADDR FLASH_SCRATCH_START
#define STAGE0_FACTORY_RANDOM_BACKUP_MAGIC (0x30524642U) // "BFR0" in little-endian flash order.
#define STAGE0_FACTORY_RANDOM_BACKUP_FORMAT_VERSION (1U)
#define STAGE0_FACTORY_RANDOM_BACKUP_COMMIT_ERASED UINT32_MAX
@@ -48,14 +50,23 @@ _Static_assert(
STAGE0_STAGE1_BLOCK_ADDR % STAGE0_FLASH_BLOCK_SIZE_BYTES == 0,
"stage1 block is unaligned");
_Static_assert(
- BB02_STAGE1_FACTORY_RANDOM_BACKUP_ADDR % STAGE0_FLASH_PAGE_SIZE_BYTES == 0,
+ STAGE0_FACTORY_RANDOM_BACKUP_ADDR % STAGE0_FLASH_PAGE_SIZE_BYTES == 0,
"factory randomness backup page is unaligned");
_Static_assert(
- BB02_STAGE1_FACTORY_RANDOM_BACKUP_BLOCK_ADDR % STAGE0_FLASH_BLOCK_SIZE_BYTES == 0,
- "factory randomness backup block is unaligned");
+ FLASH_SCRATCH_START % STAGE0_FLASH_BLOCK_SIZE_BYTES == 0,
+ "scratch space is unaligned");
_Static_assert(
- BB02_STAGE1_FACTORY_RANDOM_BACKUP_BLOCK_LEN == STAGE0_FLASH_BLOCK_SIZE_BYTES,
- "factory randomness backup must occupy one erase block");
+ FLASH_SCRATCH_LEN == STAGE0_FLASH_BLOCK_SIZE_BYTES,
+ "scratch space must occupy one erase block");
+_Static_assert(
+ FLASH_SCRATCH_START >= FLASH_BOOTDATA_START + FLASH_BOOTDATA_LEN,
+ "scratch space overlaps bootdata");
+_Static_assert(
+ FLASH_SCRATCH_START + FLASH_SCRATCH_LEN <= FLASH_SMARTEEPROM_START,
+ "scratch space overlaps SmartEEPROM");
+_Static_assert(
+ BB02_BOOTLOADER_UPGRADE_STAGE1_UPDATE_ADDR + BB02_STAGE1_MAX_LEN <= FLASH_APPDATA_START,
+ "stage1 update slot overlaps appdata");
_Static_assert(
sizeof(stage0_factory_random_backup_t) <= STAGE0_FLASH_PAGE_SIZE_BYTES,
"factory randomness backup record does not fit in one page");
@@ -79,7 +90,7 @@ static secbool_u32 __attribute__((noinline, noclone)) stage0_flash_page_addr_ok(
if (addr >= STAGE0_STAGE1_PAGE_ADDR && addr <= STAGE0_STAGE1_FACTORY_RANDOM_PAGE_ADDR) {
return sectrue_u32;
}
- if (addr == BB02_STAGE1_FACTORY_RANDOM_BACKUP_ADDR) {
+ if (addr == STAGE0_FACTORY_RANDOM_BACKUP_ADDR) {
return sectrue_u32;
}
return secfalse_u32;
@@ -96,7 +107,7 @@ static secbool_u32 __attribute__((noinline, noclone)) stage0_flash_block_addr_ok
if (addr >= STAGE0_STAGE1_BLOCK_ADDR && addr <= STAGE0_STAGE1_FACTORY_RANDOM_BLOCK_ADDR) {
return sectrue_u32;
}
- if (addr == BB02_STAGE1_FACTORY_RANDOM_BACKUP_BLOCK_ADDR) {
+ if (addr == FLASH_SCRATCH_START) {
return sectrue_u32;
}
return secfalse_u32;
### src/bootloader_upgrade/bin/bootloader-stage0-bitbox02-btconly-development.v3.bin
[binary or diff unavailable]
### src/bootloader_upgrade/bin/bootloader-stage0-bitbox02-btconly-production.v3.bin
[binary or diff unavailable]
### src/bootloader_upgrade/bin/bootloader-stage0-bitbox02-multi-development.v3.bin
[binary or diff unavailable]
### src/bootloader_upgrade/bin/bootloader-stage0-bitbox02-multi-production.v3.bin
[binary or diff unavailable]
### src/bootloader_upgrade/bin/bootloader-stage0-bitbox02nova-btconly-development.v3.bin
[binary or diff unavailable]
### src/bootloader_upgrade/bin/bootloader-stage0-bitbox02nova-btconly-production.v3.bin
[binary or diff unavailable]
### src/bootloader_upgrade/bin/bootloader-stage0-bitbox02nova-multi-development.v3.bin
[binary or diff unavailable]
### src/bootloader_upgrade/bin/bootloader-stage0-bitbox02nova-multi-production.v3.bin
[binary or diff unavailable]
### src/bootloader_upgrade/bin/checksums.txt
@@ -1,11 +1,11 @@
-f782331aa994906c65dddf7e4755feeaf0bb177b131be3914a0981af3425f1db bootloader-stage0-bitbox02-btconly-development.v1.bin
-1d575b8e8f2ebfa42090120bfc2de4e4eb38596fe6258d6c087a56dce410377e bootloader-stage0-bitbox02-btconly-production.v1.bin
-e8152d0de3024db5f87f1df81a570fb33480d293f5d696de8bfab16e5652b4e6 bootloader-stage0-bitbox02-multi-development.v1.bin
-5c83460eb12966729e0804de6570c24ffc603f5b8ff5aa8c154b2ba10e6433fc bootloader-stage0-bitbox02-multi-production.v1.bin
-61719283f9984406098822c6c8ec34509e4c3a0346a7e758d1fcad2123ebae2b bootloader-stage0-bitbox02nova-btconly-development.v1.bin
-c55c83348f96cdc8e9a1cc6952eb698c5d019a37ffdd7cca6c45033e9681a8f0 bootloader-stage0-bitbox02nova-btconly-production.v1.bin
-2fdf5db05b7913bfcea43bb2501a91d529ee5199834b43d7a48a0399c3581e92 bootloader-stage0-bitbox02nova-multi-development.v1.bin
-617d13f2cf55dc8b6d53938db06408b51e0c63296c978ddb0c6d80ce81a7cb0e bootloader-stage0-bitbox02nova-multi-production.v1.bin
+f0f5ca14d629c66ff450f24b8cd31fc3ab28600fcbea42554f922958b317b089 bootloader-stage0-bitbox02-btconly-development.v3.bin
+f18fba258882d573df79d1b643c1be5c8a0f08ba75dee02e0fecf8bddcb9f419 bootloader-stage0-bitbox02-btconly-production.v3.bin
+5db5dfdb41ea2d85e46039d96068e3c20e654a1c273fcc6331d33ed4f2c4bd2a bootloader-stage0-bitbox02-multi-development.v3.bin
+78b6e2484684304624d94ebe57275ffff73262789c0d1f899b383452de20bad3 bootloader-stage0-bitbox02-multi-production.v3.bin
+6f316d34c8ad66de31620d94981ae3c6cb1288b8c7ff57f788fcfc44dbcab976 bootloader-stage0-bitbox02nova-btconly-development.v3.bin
+a50763453e7aba78385cb7c8413dc2971a0e5eab1172250e2edde12386665285 bootloader-stage0-bitbox02nova-btconly-production.v3.bin
+d2bb2fa6bd1c285a7907c4cfc9cf142cb58f42b88133487b65e328fe3555a65d bootloader-stage0-bitbox02nova-multi-development.v3.bin
+e54afcc0a089e3062bfbb2a0213de9fc5ab3f79a7e32bbeae276aea41cca58cc bootloader-stage0-bitbox02nova-multi-production.v3.bin
e12efe809ad9a17098979242eb762cf9b682ed4208e44fb21748c2256aa4489b bootloader-stage1-bitbox02-btconly-development.v1.2.0.signed.bin
ebb93bb2c23b5266fccb93ca623fe9aadf15dd166999ba8380de37eb1ff26cae bootloader-stage1-bitbox02-btconly-production.v1.2.2.signed.bin
662b663a7fe41550a56fa76defa06f54f40d599e4416082ebab77eae35878279 bootloader-stage1-bitbox02-multi-development.v1.2.0.signed.bin
### src/bootloader_upgrade/bootloader_upgrade.h
@@ -19,10 +19,6 @@
#define BB02_STAGE1_FACTORY_RANDOM_ADDR (0x0000DFE0U)
#define BB02_STAGE1_FACTORY_RANDOM_LEN (32U)
-#define BB02_STAGE1_FACTORY_RANDOM_BACKUP_BLOCK_ADDR (0x000D8000U)
-#define BB02_STAGE1_FACTORY_RANDOM_BACKUP_BLOCK_LEN (0x00002000U)
-#define BB02_STAGE1_FACTORY_RANDOM_BACKUP_ADDR BB02_STAGE1_FACTORY_RANDOM_BACKUP_BLOCK_ADDR
-
#define BB02_BOOTLOADER_UPGRADE_STAGE1_UPDATE_ADDR (0x000DB000U)
#define BB02_STAGE1_HEADER_MAGIC (0x31534242U) // "BBS1" in little-endian flash order.
@@ -64,10 +60,6 @@ typedef struct __attribute__((__packed__)) {
#define BB02_STAGE1_HEADER_SIGNED_LEN ((uint32_t)offsetof(bb02_stage1_header_t, signatures))
_Static_assert(sizeof(bb02_stage1_header_t) == 1024, "header ABI changed");
-_Static_assert(
- BB02_STAGE1_FACTORY_RANDOM_BACKUP_ADDR + BB02_STAGE1_FACTORY_RANDOM_BACKUP_BLOCK_LEN <=
- BB02_BOOTLOADER_UPGRADE_STAGE1_UPDATE_ADDR,
- "factory randomness backup overlaps stage1 update slot");
_Static_assert(
BB02_STAGE1_HEADER_SIGNED_LEN + BB02_STAGE1_HEADER_SIGNATURES_LEN == BB02_STAGE1_HEADER_LEN,
"header ABI changed");
### src/flags.h
@@ -16,6 +16,14 @@
//
// Memory layout flash
//
+// +-------------+ 0x100000
+// | SmartEEPROM |
+// | (0x04000) |
+// | |
+// +-------------+ 0xFC000
+// | Scratch |
+// | space |
+// | (0x02000) |
// +-------------+ 0xFA000
// | Boot data |
// | (0x02000) |
@@ -37,17 +45,21 @@
// | Randomness |
// | (0x00020) |
// +-------------+ 0x0DFE0
-// | Boot |
-// | (0x0DFE0) |
+// | Stage1 |
+// | (0x0BFE0) |
+// | |
+// +-------------+ 0x02000
+// | Stage0 |
+// | (0x02000) |
// | |
// +-------------+ 0x00000
//
// The total size of the flash is 1MB (2048 pages).
#define FLASH_END (2048 * FLASH_PAGE_SIZE)
-// Even though FLASH_SIZE is 1MB (1024*1024 bytes),
-// the portion of flash that we use ends at page 2000.
+// The firmware and its data areas end at page 2000. The remaining flash is reserved
+// for scratch space and SmartEEPROM.
#define FLASH_USER_END (2000 * FLASH_PAGE_SIZE)
// Erase granularity is 1 block (8kB; 16 pages)
@@ -90,6 +102,11 @@
#define CHUNK_SIZE (FLASH_ERASE_MIN_LEN) // 8kB; minimum erase granularity
+// Shared temporary storage for stage1 and firmware. Contents may not survive a reboot:
+// stage0 currently overwrites this space with a factory randomness backup when updating stage1.
+#define FLASH_SCRATCH_START (0x000FA000U)
+#define FLASH_SCRATCH_LEN (0x00002000U)
+
// SmartEEPROM reserved memory start
#define FLASH_SMARTEEPROM_START (FLASH_END - SMARTEEPROM_RESERVED_FLASH_PAGES * FLASH_PAGE_SIZE)
### test/unit-test/test_stage0_flash.c
@@ -19,8 +19,7 @@ static void test_stage0_flash_page_addr_ok(void** state)
sectrue_u32);
assert_int_equal(
stage0_flash_page_addr_ok(STAGE0_STAGE1_FACTORY_RANDOM_PAGE_ADDR), sectrue_u32);
- assert_int_equal(
- stage0_flash_page_addr_ok(BB02_STAGE1_FACTORY_RANDOM_BACKUP_ADDR), sectrue_u32);
+ assert_int_equal(stage0_flash_page_addr_ok(STAGE0_FACTORY_RANDOM_BACKUP_ADDR), sectrue_u32);
assert_int_equal(stage0_flash_page_addr_ok(STAGE0_STAGE1_PAGE_ADDR - 1u), secfalse_u32);
assert_int_equal(
@@ -31,10 +30,19 @@ static void test_stage0_flash_page_addr_ok(void** state)
stage0_flash_page_addr_ok(
STAGE0_STAGE1_FACTORY_RANDOM_PAGE_ADDR + STAGE0_FLASH_PAGE_SIZE_BYTES),
secfalse_u32);
+ assert_int_equal(
+ stage0_flash_page_addr_ok(STAGE0_FACTORY_RANDOM_BACKUP_ADDR + STAGE0_FLASH_PAGE_SIZE_BYTES),
+ secfalse_u32);
+ for (uint32_t addr = FLASH_APP_START; addr < FLASH_APP_START + FLASH_APP_LEN;
+ addr += STAGE0_FLASH_PAGE_SIZE_BYTES) {
+ assert_int_equal(stage0_flash_page_addr_ok(addr), secfalse_u32);
+ }
+ assert_int_equal(stage0_flash_page_addr_ok(FLASH_BOOTDATA_START), secfalse_u32);
assert_int_equal(
stage0_flash_page_addr_ok(
- BB02_STAGE1_FACTORY_RANDOM_BACKUP_ADDR + STAGE0_FLASH_PAGE_SIZE_BYTES),
+ FLASH_BOOTDATA_START + FLASH_BOOTDATA_LEN - STAGE0_FLASH_PAGE_SIZE_BYTES),
secfalse_u32);
+ assert_int_equal(stage0_flash_page_addr_ok(FLASH_SMARTEEPROM_START), secfalse_u32);
}
static void test_stage0_flash_block_addr_ok(void** state)
@@ -47,8 +55,7 @@ static void test_stage0_flash_block_addr_ok(void** state)
sectrue_u32);
assert_int_equal(
stage0_flash_block_addr_ok(STAGE0_STAGE1_FACTORY_RANDOM_BLOCK_ADDR), sectrue_u32);
- assert_int_equal(
- stage0_flash_block_addr_ok(BB02_STAGE1_FACTORY_RANDOM_BACKUP_BLOCK_ADDR), sectrue_u32);
+ assert_int_equal(stage0_flash_block_addr_ok(FLASH_SCRATCH_START), sectrue_u32);
assert_int_equal(stage0_flash_block_addr_ok(STAGE0_STAGE1_BLOCK_ADDR - 1u), secfalse_u32);
assert_int_equal(
@@ -60,9 +67,14 @@ static void test_stage0_flash_block_addr_ok(void** state)
STAGE0_STAGE1_FACTORY_RANDOM_BLOCK_ADDR + STAGE0_FLASH_BLOCK_SIZE_BYTES),
secfalse_u32);
assert_int_equal(
- stage0_flash_block_addr_ok(
- BB02_STAGE1_FACTORY_RANDOM_BACKUP_BLOCK_ADDR + STAGE0_FLASH_BLOCK_SIZE_BYTES),
+ stage0_flash_block_addr_ok(FLASH_SCRATCH_START + STAGE0_FLASH_BLOCK_SIZE_BYTES),
secfalse_u32);
+ for (uint32_t addr = FLASH_APP_START; addr < FLASH_APP_START + FLASH_APP_LEN;
+ addr += STAGE0_FLASH_BLOCK_SIZE_BYTES) {
+ assert_int_equal(stage0_flash_block_addr_ok(addr), secfalse_u32);
+ }
+ assert_int_equal(stage0_flash_block_addr_ok(FLASH_BOOTDATA_START), secfalse_u32);
+ assert_int_equal(stage0_flash_block_addr_ok(FLASH_SMARTEEPROM_START), secfalse_u32);
}
static void test_stage0_flash_make_invalid_header_page(void** state)
### versions.json
@@ -1,5 +1,5 @@
{
"firmware": "v9.28.0",
"bootloader": "v1.2.3",
- "stage0": 2
+ "stage0": 3
}Why this scored 46/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.