commit 956311d2d5e5b73c9cbb8d7366f994fd31c4e986
author Dominik Ermel <dominik.ermel@nordicsemi.no> Fri Jul 12 19:53:24 2024 +0000
committer Jamie <40387179+nordicjm@users.noreply.github.com> Thu Sep 05 08:29:05 2024 +0100
tree c0d1aa1c54b2a1585c2209c67db226041bb31e90
parent 4619da56601d072b6f1fc19c807f0a5c748d88c2

boot: Make boot_enc_valid take slot instead of image index

There is no point for boot_enc_valid to take image index and
flash area and use these to figure out slot number.

Signed-off-by: Dominik Ermel <dominik.ermel@nordicsemi.no>

boot/bootutil/src/encrypted.c

diff --git a/boot/bootutil/src/encrypted.c b/boot/bootutil/src/encrypted.c
index f6f40f9..d094ea7 100644
--- a/boot/bootutil/src/encrypted.c
+++ b/boot/bootutil/src/encrypted.c
@@ -682,19 +682,9 @@
 }
 
 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

boot/bootutil/src/image_validate.c

diff --git a/boot/bootutil/src/image_validate.c b/boot/bootutil/src/image_validate.c
index 239f369..5953658 100644
--- a/boot/bootutil/src/image_validate.c
+++ b/boot/bootutil/src/image_validate.c
@@ -96,7 +96,7 @@
 #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