Skip to content

bootutil: boot_enc_set_key: error on set to valid context #2514

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

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

bootutil: boot_enc_set_key: error on set to valid context #2514

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions boot/bootutil/src/encrypted.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,6 +646,13 @@ boot_enc_set_key(struct enc_key_data *enc_state, const uint8_t *key)
{
int rc;

/* This should not be in production code; there should be no path
* where we set the key twice, without dropping the context first.
*/
if (enc_state->valid == 1) {
BOOT_LOG_DBG("boot_enc_set_key: key allready set (%p)", enc_state);
return -2;
}
rc = bootutil_aes_ctr_set_key(&enc_state->aes_ctr, key);
if (rc != 0) {
boot_enc_drop(enc_state);
Expand Down
Loading