bootutil: Move boot_enc_init in boot_swap_image

de-nordic · de-nordic · commit 028d80c36118 · 2025-10-10T12:40:24.000+02:00
Encryption context intialization can happen before we read
the key.

Signed-off-by: Dominik Ermel &lt;dominik.ermel@nordicsemi.no&gt;
diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
@@ -1723,6 +1723,9 @@ boot_swap_image(struct boot_loader_state *state, struct boot_status *bs)
 
 #ifdef MCUBOOT_ENC_IMAGES
         for (slot = 0; slot < BOOT_NUM_SLOTS; slot++) {
+
+            boot_enc_init(BOOT_CURR_ENC(state), slot);
+
             rc = boot_read_enc_key(fap, slot, bs);
             assert(rc == 0);
 
@@ -1732,8 +1735,6 @@ boot_swap_image(struct boot_loader_state *state, struct boot_status *bs)
                 }
             }
 
-            boot_enc_init(BOOT_CURR_ENC(state), slot);
-
             if (i != BOOT_ENC_KEY_SIZE) {
                 boot_enc_set_key(BOOT_CURR_ENC(state), slot, bs);
             }

Original file line number	Diff line number	Diff line change
`@@ -1723,6 +1723,9 @@ boot_swap_image(struct boot_loader_state state, struct boot_status bs)`
`1723`	`1723`
`1724`	`1724`	`#ifdef MCUBOOT_ENC_IMAGES`
`1725`	`1725`	`for (slot = 0; slot < BOOT_NUM_SLOTS; slot++) {`
	`1726`	`+`
	`1727`	`+ boot_enc_init(BOOT_CURR_ENC(state), slot);`
	`1728`	`+`
`1726`	`1729`	`rc = boot_read_enc_key(fap, slot, bs);`
`1727`	`1730`	`assert(rc == 0);`
`1728`	`1731`
`@@ -1732,8 +1735,6 @@ boot_swap_image(struct boot_loader_state state, struct boot_status bs)`
`1732`	`1735`	`}`
`1733`	`1736`	`}`
`1734`	`1737`
`1735`		`- boot_enc_init(BOOT_CURR_ENC(state), slot);`
`1736`		`-`
`1737`	`1738`	`if (i != BOOT_ENC_KEY_SIZE) {`
`1738`	`1739`	`boot_enc_set_key(BOOT_CURR_ENC(state), slot, bs);`
`1739`	`1740`	`}`