commit 4d85e29f3d5ac67c1af9b2c8bac812ecc8249a3e
author Jamie McCrae <jamie.mccrae@nordicsemi.no> Fri Aug 23 08:25:24 2024 +0100
committer Jamie <40387179+nordicjm@users.noreply.github.com> Tue Aug 27 15:34:13 2024 +0100
tree fcb57788fa365bfb03bc187f72dd3cb60d2d9ce7
parent 206c7e749610b6a8855fb1598b9fe27d1eba08bf

bootutil: loader: Remove images with conflicting flags

Marks images as invalid if they have conflicting flags, e.g. more
than one type of LZMA compression or more than one type of
encryption

Signed-off-by: Jamie McCrae <jamie.mccrae@nordicsemi.no>

boot/bootutil/src/loader.c

diff --git a/boot/bootutil/src/loader.c b/boot/bootutil/src/loader.c
index 743aa9a..7a6b020 100644
--- a/boot/bootutil/src/loader.c
+++ b/boot/bootutil/src/loader.c
@@ -888,12 +888,24 @@
     if (IS_ENCRYPTED(hdr)) {
         return false;
     }
+#else
+    if ((hdr->ih_flags & IMAGE_F_ENCRYPTED_AES128) &&
+        (hdr->ih_flags & IMAGE_F_ENCRYPTED_AES256))
+    {
+        return false;
+    }
 #endif
 
 #if !defined(MCUBOOT_DECOMPRESS_IMAGES)
     if (IS_COMPRESSED(hdr)) {
         return false;
     }
+#else
+    if ((hdr->ih_flags & IMAGE_F_COMPRESSED_LZMA1) &&
+        (hdr->ih_flags & IMAGE_F_COMPRESSED_LZMA2))
+    {
+        return false;
+    }
 #endif
 
     return true;