boot: bootutil: Fix encryption/decryption size during copy

Stephane-LeRoy · nvlsianpu · commit 0319e91cdb0d · 2025-06-26T12:58:23.000+02:00
During region copy, when chunk contains both header and TLVs,
the encryption/decryption size is too large, as it takes into account
TLVs only.
The fix modifies the encryption/decryption size to take into
account both header and TLVs.

Signed-off-by: Stephane Le Roy &lt;stephane.leroy@st.com&gt;
diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
@@ -1534,7 +1534,7 @@ boot_copy_region(struct boot_loader_state *state,
                     if (abs_off >= tlv_off) {
                         blk_sz = 0;
                     } else {
-                        blk_sz = tlv_off - abs_off;
+                        blk_sz = tlv_off - abs_off - idx;
                     }
                 }
                 if (source_slot == 0) {

Original file line number	Diff line number	Diff line change
`@@ -1534,7 +1534,7 @@ boot_copy_region(struct boot_loader_state *state,`
`1534`	`1534`	`if (abs_off >= tlv_off) {`
`1535`	`1535`	`blk_sz = 0;`
`1536`	`1536`	`} else {`
`1537`		`- blk_sz = tlv_off - abs_off;`
	`1537`	`+ blk_sz = tlv_off - abs_off - idx;`
`1538`	`1538`	`}`
`1539`	`1539`	`}`
`1540`	`1540`	`if (source_slot == 0) {`