commit 7679215d00a727a4065f81b50efe845274f7692f
author Wouter Cappelle <wouter.cappelle@crodeon.com> Wed Jan 19 17:28:55 2022 +0100
committer Fabio Utzig <utzig@utzig.org> Thu Jan 20 19:54:29 2022 -0300
tree 3c4db190e59bfca7ad8f63edd2aae83d8e167396
parent c8ba937ee3c37505b329b1905eeac217ed38029d

single_loader: zephyr: Fix compilation with VALIDATE_PRIMARY_SLOT enabled

Fixes compilation when VALIDATE_PRIMARY_SLOT & SINGLE_APPlICATION_SLOT
are enabled.

Signed-off-by: Wouter Cappelle <wouter.cappelle@crodeon.com>

boot/zephyr/single_loader.c

diff --git a/boot/zephyr/single_loader.c b/boot/zephyr/single_loader.c
index 24032e1..643977f 100644
--- a/boot/zephyr/single_loader.c
+++ b/boot/zephyr/single_loader.c
@@ -41,14 +41,14 @@
      * the pointer from compilation.
      */
     /* Validate hash */
-    if (hdr->ih_flags & IMAGE_F_ENCRYPTED)
+    if (IS_ENCRYPTED(hdr))
     {
         /* Clear the encrypted flag we didn't supply a key
          * This flag could be set if there was a decryption in place
          * was performed. We will try to validate the image, and if still
          * encrypted the validation will fail, and go in panic mode
          */
-        hdr->ih_flags &= ~IMAGE_F_ENCRYPTED;
+        hdr->ih_flags &= ~(ENCRYPTIONFLAGS);
     }
     FIH_CALL(bootutil_img_validate, fih_rc, NULL, 0, hdr, fa_p, tmpbuf,
              BOOT_TMPBUF_SZ, NULL, 0, NULL);