djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32/mboot: Verify signature of fsload packed DFU files before writing.

Browse Source 
When verifying the DFU contents, the signature of signed/encrypted files is
also now checked in this initial, dry-run stage.
This commit is contained in:
Andrew Leech 2021-06-17 12:51:37 +10:00 committed by Damien George
parent 80055c2cdc
commit bc856a1e29
5 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ports/stm32/mboot/fsload.c
View File

@ -151,13 +151,11 @@ static int fsload_program_file(bool write_to_flash) {
if (res != l) { if (res != l) {
return -MBOOT_ERRNO_DFU_READ_ERROR; return -MBOOT_ERRNO_DFU_READ_ERROR;
} }
if (write_to_flash) { res = do_write(elem_addr, buf, l, !write_to_flash);
res = do_write(elem_addr, buf, l); if (res != 0) {
if (res != 0) { return res;
return res;
}
elem_addr += l;
} }
elem_addr += l;
s -= l; s -= l;
} }

16
ports/stm32/mboot/main.c
View File

@ -715,11 +715,15 @@ void do_read(mboot_addr_t addr, size_t len, uint8_t *buf) {
#endif #endif
} }
int do_write(uint32_t addr, const uint8_t *src8, size_t len) { int do_write(uint32_t addr, const uint8_t *src8, size_t len, bool dry_run) {
#if MBOOT_ENABLE_PACKING #if MBOOT_ENABLE_PACKING
return mboot_pack_write(addr, src8, len); return mboot_pack_write(addr, src8, len, dry_run);
#else #else
return hw_write(addr, src8, len); if (dry_run) {
return 0;
} else {
return hw_write(addr, src8, len);
}
#endif #endif
} }
@ -844,7 +848,7 @@ void i2c_slave_process_rx_end(i2c_slave_t *i2c) {
// Mark the 2 lower bits to indicate invalid app firmware // Mark the 2 lower bits to indicate invalid app firmware
buf[1] |= APP_VALIDITY_BITS; buf[1] |= APP_VALIDITY_BITS;
} }
int ret = do_write(i2c_obj.cmd_wraddr, buf + 1, len); int ret = do_write(i2c_obj.cmd_wraddr, buf + 1, len, false);
if (ret < 0) { if (ret < 0) {
len = ret; len = ret;
} else { } else {
@ -866,7 +870,7 @@ void i2c_slave_process_rx_end(i2c_slave_t *i2c) {
len = -1; len = -1;
} else { } else {
buf &= ~APP_VALIDITY_BITS; buf &= ~APP_VALIDITY_BITS;
int ret = do_write(APPLICATION_ADDR, (void*)&buf, 4); int ret = do_write(APPLICATION_ADDR, (void*)&buf, 4, false);
if (ret < 0) { if (ret < 0) {
len = ret; len = ret;
} else { } else {
@ -940,7 +944,7 @@ static int dfu_process_dnload(void) {
} else if (dfu_context.wBlockNum > 1) { } else if (dfu_context.wBlockNum > 1) {
// write data to memory // write data to memory
uint32_t addr = (dfu_context.wBlockNum - 2) * DFU_XFER_SIZE + dfu_context.addr; uint32_t addr = (dfu_context.wBlockNum - 2) * DFU_XFER_SIZE + dfu_context.addr;
ret = do_write(addr, dfu_context.buf, dfu_context.wLength); ret = do_write(addr, dfu_context.buf, dfu_context.wLength, false);
} }
if (ret == 0) { if (ret == 0) {
return DFU_STATE_DNLOAD_IDLE; return DFU_STATE_DNLOAD_IDLE;

2
ports/stm32/mboot/mboot.h
View File

@ -113,7 +113,7 @@ int hw_write(uint32_t addr, const uint8_t *src8, size_t len);
int do_page_erase(uint32_t addr, uint32_t *next_addr); int do_page_erase(uint32_t addr, uint32_t *next_addr);
void do_read(mboot_addr_t addr, size_t len, uint8_t *buf); void do_read(mboot_addr_t addr, size_t len, uint8_t *buf);
int do_write(uint32_t addr, const uint8_t *src8, size_t len); int do_write(uint32_t addr, const uint8_t *src8, size_t len, bool dry_run);
const uint8_t *elem_search(const uint8_t *elem, uint8_t elem_id); const uint8_t *elem_search(const uint8_t *elem, uint8_t elem_id);
int fsload_process(void); int fsload_process(void);

5
ports/stm32/mboot/pack.c
View File

@ -206,7 +206,7 @@ static int mboot_pack_handle_firmware(void) {
} }
} }
int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len) { int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len, bool dry_run) {
if (addr == APPLICATION_ADDR) { if (addr == APPLICATION_ADDR) {
// Base address of main firmware, reset any previous state // Base address of main firmware, reset any previous state
firmware_chunk_base_addr = 0; firmware_chunk_base_addr = 0;
@ -274,6 +274,9 @@ int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len) {
} }
// Signature passed, we have valid chunk. // Signature passed, we have valid chunk.
if (dry_run) {
return 0;
}
if (firmware_chunk_buf.header.format == MBOOT_PACK_CHUNK_META) { if (firmware_chunk_buf.header.format == MBOOT_PACK_CHUNK_META) {
// Ignore META chunks. // Ignore META chunks.

2
ports/stm32/mboot/pack.h
View File

@ -75,7 +75,7 @@ extern const uint8_t mboot_pack_secretbox_key[hydro_secretbox_KEYBYTES];
// Implementation // Implementation
void mboot_pack_init(void); void mboot_pack_init(void);
int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len); int mboot_pack_write(uint32_t addr, const uint8_t *src8, size_t len, bool dry_run);
#endif // MBOOT_ENABLE_PACKING #endif // MBOOT_ENABLE_PACKING