WolfSSL
/
wolfBoot
mirror of https://github.com/wolfSSL/wolfBoot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed bug in encrypted update, removed swap_counter.

pull/72/head
Daniele Lacamera 2020-07-15 17:36:38 +02:00
parent d31bfc2032
commit b2beb49370
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libwolfboot.c
View File

@ -587,8 +587,6 @@ static inline uint8_t part_address(uintptr_t a)
return PART_NONE; return PART_NONE;
} }
static uint32_t swap_counter = 0;
int ext_flash_encrypt_write(uintptr_t address, const uint8_t *data, int len) int ext_flash_encrypt_write(uintptr_t address, const uint8_t *data, int len)
{ {
uint32_t iv_counter; uint32_t iv_counter;
@ -622,7 +620,7 @@ int ext_flash_encrypt_write(uintptr_t address, const uint8_t *data, int len)
{ {
uint32_t row_number; uint32_t row_number;
row_number = (address - WOLFBOOT_PARTITION_SWAP_ADDRESS) / ENCRYPT_BLOCK_SIZE; row_number = (address - WOLFBOOT_PARTITION_SWAP_ADDRESS) / ENCRYPT_BLOCK_SIZE;
iv_counter = ((swap_counter++) << 8) + row_number; iv_counter = row_number;
break; break;
} }
default: default:
@ -682,8 +680,8 @@ int ext_flash_decrypt_read(uintptr_t address, uint8_t *data, int len)
case PART_SWAP: case PART_SWAP:
{ {
uint32_t row_number; uint32_t row_number;
row_number = (address - WOLFBOOT_PARTITION_UPDATE_ADDRESS) / ENCRYPT_BLOCK_SIZE; row_number = (address - WOLFBOOT_PARTITION_SWAP_ADDRESS) / ENCRYPT_BLOCK_SIZE;
iv_counter = (swap_counter << 8) + row_number; iv_counter = row_number;
break; break;
} }
default: default:

2
tools/uart-flash-server/ufserver.c
View File

@ -188,7 +188,7 @@ uint8_t *mmap_firmware(const char *fname)
perror("open"); perror("open");
return (void *)-1; return (void *)-1;
} }
if (st.st_size < FIRMWARE_PARTITION_SIZE) { if (st.st_size <= FIRMWARE_PARTITION_SIZE) {
uint8_t pad = 0xFF; uint8_t pad = 0xFF;
int i; int i;
const char update_flags[] = "pBOOT"; const char update_flags[] = "pBOOT";