OrgZephyr/mcuboot
OrgZephyr
/
mcuboot
mirror of https://github.com/zephyrproject-rtos/mcuboot.git
1
0
Fork 0
Code Issues Releases Wiki Activity

boot: Move encryption context invalidation to boot_enc_drop. 

The enc_key_data.valid had been set to true when key has been added
to the encryption context, but in case when boot_enc_drop was called,
on the same context, the flag remained true, even though the context
may no longer hold any valid context nor key.
The commit moves the enc_key_data invalidation to enc_key_drop.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
(cherry picked from commit 335573520d)
This commit is contained in:
Dominik Ermel 2024-07-17 12:11:55 +00:00 committed by Jamie McCrae
parent 86b1ef198b
commit 7566edaf88
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot/bootutil/src/encrypted.c
View File

@ -347,6 +347,7 @@ int
boot_enc_drop(struct enc_key_data *enc_state, uint8_t slot) boot_enc_drop(struct enc_key_data *enc_state, uint8_t slot)
{ {
bootutil_aes_ctr_drop(&enc_state[slot].aes_ctr); bootutil_aes_ctr_drop(&enc_state[slot].aes_ctr);
enc_state[slot].valid = 0;
return 0; return 0;
} }
@ -359,7 +360,6 @@ boot_enc_set_key(struct enc_key_data *enc_state, uint8_t slot,
rc = bootutil_aes_ctr_set_key(&enc_state[slot].aes_ctr, bs->enckey[slot]); rc = bootutil_aes_ctr_set_key(&enc_state[slot].aes_ctr, bs->enckey[slot]);
if (rc != 0) { if (rc != 0) {
boot_enc_drop(enc_state, slot); boot_enc_drop(enc_state, slot);
enc_state[slot].valid = 0;
return -1; return -1;
} }