boot: bootutil: fix image_index definition

stgloorious · de-nordic · commit 17a6ecd279d6 · 2025-10-07T15:08:25.000+02:00
image_index is used when when MCUBOOT_BUILTIN_KEY and
EXPECTED_SIG_TLV is set, but in this case this
variable is never defined.

Signed-off-by: Stefan Gloor &lt;stefan.gloor@siemens.com&gt;
diff --git a/boot/bootutil/src/image_validate.c b/boot/bootutil/src/image_validate.c
@@ -204,8 +204,10 @@ bootutil_img_validate(struct boot_loader_state *state,
                       int seed_len, uint8_t *out_hash
                      )
 {
-#if (defined(EXPECTED_KEY_TLV) && defined(MCUBOOT_HW_KEY)) || defined(MCUBOOT_HW_ROLLBACK_PROT) \
-    || defined(MCUBOOT_UUID_VID) || defined(MCUBOOT_UUID_CID)
+#if (defined(EXPECTED_KEY_TLV) && defined(MCUBOOT_HW_KEY)) || \
+    (defined(EXPECTED_SIG_TLV) && defined(MCUBOOT_BUILTIN_KEY)) || \
+    defined(MCUBOOT_HW_ROLLBACK_PROT) || \
+    defined(MCUBOOT_UUID_VID) || defined(MCUBOOT_UUID_CID)
     int image_index = (state == NULL ? 0 : BOOT_CURR_IMG(state));
 #endif
     uint32_t off;

Original file line number	Diff line number	Diff line change
`@@ -204,8 +204,10 @@ bootutil_img_validate(struct boot_loader_state *state,`
`204`	`204`	`int seed_len, uint8_t *out_hash`
`205`	`205`	`)`
`206`	`206`	`{`
`207`		`-#if (defined(EXPECTED_KEY_TLV) && defined(MCUBOOT_HW_KEY)) \|\| defined(MCUBOOT_HW_ROLLBACK_PROT) \`
`208`		`- \|\| defined(MCUBOOT_UUID_VID) \|\| defined(MCUBOOT_UUID_CID)`
	`207`	`+#if (defined(EXPECTED_KEY_TLV) && defined(MCUBOOT_HW_KEY)) \|\| \`
	`208`	`+ (defined(EXPECTED_SIG_TLV) && defined(MCUBOOT_BUILTIN_KEY)) \|\| \`
	`209`	`+ defined(MCUBOOT_HW_ROLLBACK_PROT) \|\| \`
	`210`	`+ defined(MCUBOOT_UUID_VID) \|\| defined(MCUBOOT_UUID_CID)`
`209`	`211`	`int image_index = (state == NULL ? 0 : BOOT_CURR_IMG(state));`
`210`	`212`	`#endif`
`211`	`213`	`uint32_t off;`