Skip to content
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

Jump to bottom

Fixed flag comparison selecting most recent flags #470

Merged
merged 12 commits into from
Jul 18, 2024
Merged

Fixed flag comparison selecting most recent flags #470

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift click to select a range
2ec2bcd
Fixed flag comparison selecting most recent flags
danielinux Jul 17, 2024
04111a6
Added unit tests for FLAGS_HOME fix NVM election
danielinux Jul 17, 2024
9250abb
Fixed erase address in case of NVM FLAGS_HOME
danielinux Jul 17, 2024
e586087
Added unit test NVM ENCRYPTION, fix offset
danielinux Jul 17, 2024
8b73250
Set trailer on BOOT partition when storing the enc key
danielinux Jul 17, 2024
d3795c8
Implicitly add trailer when setting enc key
danielinux Jul 17, 2024
d313806
Fix key persistence with FLAGS_HOME EXT_ENCTYPT
danielinux Jul 18, 2024
55396ed
Restore erase in update_trigger.
danielinux Jul 18, 2024
d390873
Fix padding in test
danielinux Jul 18, 2024
682873e
Test CI update on 'build' workflow
danielinux Jul 18, 2024
428a943
Fixed STM32F7 linker script error with new gcc
danielinux Jul 18, 2024
aaf40aa
Removed ferror(NULL) from lms_common
danielinux Jul 18, 2024
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
Prev Previous commit
Next Next commit
Implicitly add trailer when setting enc key
  • Loading branch information
@danielinux
danielinux committed Jul 17, 2024
commit d3795c81cdfef2c6839cfdcbcf803b46d357a66f
4 changes: 3 additions & 1 deletion src/libwolfboot.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1381,9 1381,12 @@ static int RAMFUNCTION hal_set_key(const uint8_t *k, const uint8_t *nonce)
if (ret != 0)
return ret;
#endif

XMEMCPY(ENCRYPT_CACHE addr_off, k, ENCRYPT_KEY_SIZE);
XMEMCPY(ENCRYPT_CACHE addr_off ENCRYPT_KEY_SIZE, nonce,
ENCRYPT_NONCE_SIZE);
XMEMCPY(ENCRYPT_CACHE addr_off - 4,
&wolfboot_magic_trail, 4);
ret = hal_flash_write(addr_align, ENCRYPT_CACHE, WOLFBOOT_SECTOR_SIZE);
#ifdef NVM_FLASH_WRITEONCE
/* now erase the old populated sector */
Expand Down Expand Up @@ -1412,7 1415,6 @@ static int RAMFUNCTION hal_set_key(const uint8_t *k, const uint8_t *nonce)
int RAMFUNCTION wolfBoot_set_encrypt_key(const uint8_t *key,
const uint8_t *nonce)
{
set_partition_magic(PART_BOOT);
hal_set_key(key, nonce);
return 0;
}
Expand Down
2 changes: 1 addition & 1 deletion src/update_flash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -821,7 821,7 @@ void RAMFUNCTION wolfBoot_start(void)
updateRet = wolfBoot_get_partition_state(PART_UPDATE, &updateState);


#if !defined(DISABLE_BACKUP) && !defined(EXT_ENCRYPTED)
#if !defined(DISABLE_BACKUP)
/* resume the final erase in case the power failed before it finished */
resumedFinalErase = wolfBoot_swap_and_final_erase(1);
if (resumedFinalErase != 0)
Expand Down
Loading