[nrf fromlist] boot: Make boot_enc_valid take slot instead of image i…

…ndex There is no point for boot_enc_valid to take image index and flash area and use these to figure out slot number. Upstream PR: mcu-tools/mcuboot#2006 Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>
de-nordic · Jul 26, 2024 · 25322f1 · 25322f1
1 parent 05e147c
commit 25322f1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/boot/bootutil/include/bootutil/enc_key.h b/boot/bootutil/include/bootutil/enc_key.h
@@ -58,8 +58,7 @@ int boot_enc_set_key(struct enc_key_data *enc_state, uint8_t slot,
 int boot_enc_load(struct enc_key_data *enc_state, int slot,
  const struct image_header *hdr, const struct flash_area *fap,
  struct boot_status *bs);
-bool boot_enc_valid(struct enc_key_data *enc_state, int image_index,
- const struct flash_area *fap);
+bool boot_enc_valid(struct enc_key_data *enc_state, int slot);
 void boot_encrypt(struct enc_key_data *enc_state, int image_index,
  int fa_id, uint32_t off, uint32_t sz,
  uint32_t blk_off, uint8_t *buf);

diff --git a/boot/bootutil/src/encrypted.c b/boot/bootutil/src/encrypted.c
@@ -657,19 +657,9 @@ boot_enc_load(struct enc_key_data *enc_state, int slot,
 }
 
 bool
-boot_enc_valid(struct enc_key_data *enc_state, int image_index,
- const struct flash_area *fap)
+boot_enc_valid(struct enc_key_data *enc_state, int slot)
 {
- int rc;
-
- rc = flash_area_id_to_multi_image_slot(image_index, flash_area_get_id(fap));
- if (rc < 0) {
- /* can't get proper slot number - skip encryption, */
- /* postpone the error for a upper layer */
- return false;
- }
-
- return enc_state[rc].valid;
+ return enc_state[slot].valid;
 }
 
 void

diff --git a/boot/bootutil/src/image_validate.c b/boot/bootutil/src/image_validate.c
@@ -96,7 +96,7 @@ bootutil_img_hash(struct enc_key_data *enc_state, int image_index,
 #ifdef MCUBOOT_ENC_IMAGES
  /* Encrypted images only exist in the secondary slot */
  if (MUST_DECRYPT(fap, image_index, hdr) &&
- !boot_enc_valid(enc_state, image_index, fap)) {
+ !boot_enc_valid(enc_state, 1)) {
  return -1;
  }
 #endif