[nrf mergeup] merge upsteram up to commit 5e6f5e0

Signed-off-by: Andrzej Puzdrowski <[email protected]>

Author: nvlsianpu

boot/bootutil/include/bootutil/caps.h

@@ -41,6 +41,12 @@ uint32_t bootutil_get_caps(void);
 #define BOOTUTIL_CAP_ENC_KW                 (1<<6)
 #define BOOTUTIL_CAP_VALIDATE_PRIMARY_SLOT  (1<<7)
 
+/*
+ * Query the number of images this bootloader is configured for.  This
+ * is also primarily used for testing.
+ */
+uint32_t bootutil_get_num_images(void);
+
 #ifdef __cplusplus
 }
 #endif

boot/bootutil/include/bootutil/sha256.h

@@ -31,10 +31,9 @@
 
 #include "mcuboot_config/mcuboot_config.h"
 
-#define NUM_CRYPTO_BACKENDS (defined(MCUBOOT_USE_MBED_TLS) +\
-			     defined(MCUBOOT_USE_TINYCRYPT) +\
-			     defined(MCUBOOT_USE_CC310))
-#if NUM_CRYPTO_BACKENDS != 1
+#if (defined(MCUBOOT_USE_MBED_TLS) + \
+     defined(MCUBOOT_USE_TINYCRYPT) + \
+     defined(MCUBOOT_USE_CC310)) != 1
     #error "One crypto backend must be defined either CC310, MBED_TLS or TINYCRYPT"
 #endif
 

boot/bootutil/src/caps.c

@@ -19,31 +19,40 @@
 
 uint32_t bootutil_get_caps(void)
 {
-        uint32_t res = 0;
+    uint32_t res = 0;
 
 #if defined(MCUBOOT_SIGN_RSA)
-        res |= BOOTUTIL_CAP_RSA2048;
+    res |= BOOTUTIL_CAP_RSA2048;
 #endif
 #if defined(MCUBOOT_SIGN_EC)
-        res |= BOOTUTIL_CAP_ECDSA_P224;
+    res |= BOOTUTIL_CAP_ECDSA_P224;
 #endif
 #if defined(MCUBOOT_SIGN_EC256)
-        res |= BOOTUTIL_CAP_ECDSA_P256;
+    res |= BOOTUTIL_CAP_ECDSA_P256;
 #endif
 #if defined(MCUBOOT_OVERWRITE_ONLY)
-        res |= BOOTUTIL_CAP_OVERWRITE_UPGRADE;
+    res |= BOOTUTIL_CAP_OVERWRITE_UPGRADE;
 #else
-        res |= BOOTUTIL_CAP_SWAP_UPGRADE;
+    res |= BOOTUTIL_CAP_SWAP_UPGRADE;
 #endif
 #if defined(MCUBOOT_ENCRYPT_RSA)
-	res |= BOOTUTIL_CAP_ENC_RSA;
+    res |= BOOTUTIL_CAP_ENC_RSA;
 #endif
 #if defined(MCUBOOT_ENCRYPT_KW)
-	res |= BOOTUTIL_CAP_ENC_KW;
+    res |= BOOTUTIL_CAP_ENC_KW;
 #endif
 #if defined(MCUBOOT_VALIDATE_PRIMARY_SLOT)
-	res |= BOOTUTIL_CAP_VALIDATE_PRIMARY_SLOT;
+    res |= BOOTUTIL_CAP_VALIDATE_PRIMARY_SLOT;
 #endif
 
-        return res;
+    return res;
+}
+
+uint32_t bootutil_get_num_images(void)
+{
+#if defined(MCUBOOT_IMAGE_NUMBER)
+    return MCUBOOT_IMAGE_NUMBER;
+#else
+    return 1;
+#endif
 }