Commit 26bbc187 authored by Salome Thirot's avatar Salome Thirot Committed by Andrzej Puzdrowski
Browse files

boot: Fix IS_ENCRYPTED macro definition 



The previous definition did not work as setting any type of flag would
make IS_ENCRYPTED true.

Signed-off-by: default avatarSalome Thirot <salome.thirot@arm.com>
(cherry picked from commit 23862672)
Signed-off-by: default avatarAndrzej Puzdrowski <andrzej.puzdrowski@nordicsemi.no>
parent a1d5aea6

boot/bootutil/include/bootutil/image.h

+2 −2
Original line number Diff line number Diff line
@@ -149,8 +149,8 @@ struct image_tlv { 
    uint16_t it_len;    /* Data length (not including TLV header). */

};



#define IS_ENCRYPTED(hdr) (((hdr)->ih_flags && IMAGE_F_ENCRYPTED_AES128) \

                        || ((hdr)->ih_flags && IMAGE_F_ENCRYPTED_AES256))

#define IS_ENCRYPTED(hdr) (((hdr)->ih_flags & IMAGE_F_ENCRYPTED_AES128) \

                        || ((hdr)->ih_flags & IMAGE_F_ENCRYPTED_AES256))

#define MUST_DECRYPT(fap, idx, hdr) \

    ((fap)->fa_id == FLASH_AREA_IMAGE_SECONDARY(idx) && IS_ENCRYPTED(hdr))

CRA Git | Maintained and supported by SUSTech CRA and CCSE