(Auto-)Upmerge 20231010

.github/workflows/sim.yaml

@@ -44,6 +44,7 @@ jobs:
         - "sig-rsa validate-primary-slot ram-load multiimage"
         - "sig-rsa validate-primary-slot direct-xip multiimage"
         - "sig-ecdsa hw-rollback-protection multiimage"
+        - "sig-ecdsa-psa,sig-ecdsa-psa sig-p384"
         - "ram-load enc-aes256-kw multiimage"
         - "ram-load enc-aes256-kw sig-ecdsa-mbedtls multiimage"
     runs-on: ubuntu-latest

README.md

@@ -4,6 +4,7 @@
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/12307/badge.svg)][coverity]
 [![Build Status (Sim)](https://github.com/mcu-tools/mcuboot/workflows/Sim/badge.svg)][sim]
 [![Build Status (Mynewt)](https://github.com/mcu-tools/mcuboot/workflows/Mynewt/badge.svg)][mynewt]
+[![Build Status (Espressif)](https://github.com/mcu-tools/mcuboot/workflows/Espressif/badge.svg)][espressif]
 [![Publishing Status (imgtool)](https://github.com/mcu-tools/mcuboot/workflows/imgtool/badge.svg)][imgtool]
 [![Build Status (Travis CI)](https://img.shields.io/travis/mcu-tools/mcuboot/main.svg?label=travis-ci)][travis]
 [![Apache 2.0](https://img.shields.io/badge/License-Apache%202.0-blue.svg)][license]
@@ -12,11 +13,12 @@
 [coverity]: https://scan.coverity.com/projects/mcuboot
 [sim]: https://github.com/mcu-tools/mcuboot/actions?query=workflow:Sim
 [mynewt]: https://github.com/mcu-tools/mcuboot/actions?query=workflow:Mynewt
+[espressif]: https://github.com/mcu-tools/mcuboot/actions?query=workflow:Espressif
 [imgtool]: https://github.com/mcu-tools/mcuboot/actions?query=workflow:imgtool
 [travis]: https://travis-ci.org/mcu-tools/mcuboot
 [license]: https://github.com/mcu-tools/mcuboot/blob/main/LICENSE
 
-This is MCUboot version 1.11.0-dev
+This is MCUboot version 2.1.0-dev
 
 MCUboot is a secure bootloader for 32-bits microcontrollers. It defines a
 common infrastructure for the bootloader and the system flash layout on

boot/boot_serial/src/boot_serial.c

@@ -231,7 +231,7 @@ bs_list_img_ver(char *dst, int maxlen, struct image_version *ver)
                   (uint16_t)ver->iv_minor, ver->iv_revision);
 
    if (ver->iv_build_num != 0 && len > 0 && len < maxlen) {
-      snprintf(&dst[len], (maxlen - len), "%u", ver->iv_build_num);
+      snprintf(&dst[len], (maxlen - len), ".%u", ver->iv_build_num);
    }
 }
 #endif /* !MCUBOOT_USE_SNPRINTF */
@@ -259,7 +259,11 @@ bs_list(char *buf, int len)
         int swap_status = boot_swap_type_multi(image_index);
 #endif
 
+#ifdef MCUBOOT_SINGLE_APPLICATION_SLOT
+        for (slot = 0; slot < 1; slot++) {
+#else
         for (slot = 0; slot < 2; slot++) {
+#endif
             FIH_DECLARE(fih_rc, FIH_FAILURE);
             uint8_t tmpbuf[64];
 
@@ -289,15 +293,24 @@ bs_list(char *buf, int len)
                                    fih_rc, image_index, slot);
                 if (FIH_EQ(fih_rc, FIH_BOOT_HOOK_REGULAR))
                 {
-#ifdef MCUBOOT_ENC_IMAGES
-                    if (IS_ENCRYPTED(&hdr)) {
+#if defined(MCUBOOT_ENC_IMAGES)
+                    if (IS_ENCRYPTED(&hdr) && MUST_DECRYPT(fap, image_index, &hdr)) {
                         FIH_CALL(boot_image_validate_encrypted, fih_rc, fap,
                                  &hdr, tmpbuf, sizeof(tmpbuf));
                     } else {
+                        if (IS_ENCRYPTED(&hdr)) {
+                            /*
+                             * There is an image present which has an encrypted flag set but is
+                             * not encrypted, therefore remove the flag from the header and run a
+                             * normal image validation on it.
+                             */
+                            hdr.ih_flags &= ~ENCRYPTIONFLAGS;
+                        }
 #endif
+
                         FIH_CALL(bootutil_img_validate, fih_rc, NULL, 0, &hdr,
                                  fap, tmpbuf, sizeof(tmpbuf), NULL, 0, NULL);
-#ifdef MCUBOOT_ENC_IMAGES
+#if defined(MCUBOOT_ENC_IMAGES)
                     }
 #endif
                 }
@@ -1010,11 +1023,11 @@ boot_serial_input(char *buf, int len)
         }
     } else if (hdr->nh_group == MGMT_GROUP_ID_DEFAULT) {
         switch (hdr->nh_id) {
-        case NMGR_ID_ECHO:
 #ifdef MCUBOOT_BOOT_MGMT_ECHO
+        case NMGR_ID_ECHO:
             bs_echo(buf, len);
-#endif
             break;
+#endif
         case NMGR_ID_CONS_ECHO_CTRL:
             bs_rc_rsp(0);
             break;
@@ -1189,6 +1202,10 @@ boot_serial_read_console(const struct boot_uart_funcs *f,int timeout_in_ms)
     int max_input;
     int elapsed_in_ms = 0;
 
+#ifndef MCUBOOT_SERIAL_WAIT_FOR_DFU
+    bool allow_idle = true;
+#endif
+
     boot_uf = f;
     max_input = sizeof(in_buf);
 
@@ -1200,14 +1217,20 @@ boot_serial_read_console(const struct boot_uart_funcs *f,int timeout_in_ms)
          * from serial console (if single-thread mode is used).
          */
 #ifndef MCUBOOT_SERIAL_WAIT_FOR_DFU
-        MCUBOOT_CPU_IDLE();
+        if (allow_idle == true) {
+            MCUBOOT_CPU_IDLE();
+            allow_idle = false;
+        }
 #endif
         MCUBOOT_WATCHDOG_FEED();
 #ifdef MCUBOOT_SERIAL_WAIT_FOR_DFU
         uint32_t start = k_uptime_get_32();
 #endif
         rc = f->read(in_buf + off, sizeof(in_buf) - off, &full_line);
         if (rc <= 0 && !full_line) {
+#ifndef MCUBOOT_SERIAL_WAIT_FOR_DFU
+            allow_idle = true;
+#endif
             goto check_timeout;
         }
         off += rc;

boot/bootutil/include/bootutil/bootutil_public.h

@@ -85,8 +85,10 @@ extern "C" {
 
 #ifdef MCUBOOT_BOOT_MAX_ALIGN
 
+#if defined(MCUBOOT_SWAP_USING_MOVE) || defined(MCUBOOT_SWAP_USING_SCRATCH)
 _Static_assert(MCUBOOT_BOOT_MAX_ALIGN >= 8 && MCUBOOT_BOOT_MAX_ALIGN <= 32,
-               "Unsupported value for MCUBOOT_BOOT_MAX_ALIGN");
+               "Unsupported value for MCUBOOT_BOOT_MAX_ALIGN for SWAP upgrade modes");
+#endif
 
 #define BOOT_MAX_ALIGN          MCUBOOT_BOOT_MAX_ALIGN
 #define BOOT_MAGIC_ALIGN_SIZE   ALIGN_UP(BOOT_MAGIC_SZ, BOOT_MAX_ALIGN)

boot/bootutil/include/bootutil/caps.h

@@ -52,6 +52,7 @@ uint32_t bootutil_get_caps(void);
 #define BOOTUTIL_CAP_RAM_LOAD               (1<<16)
 #define BOOTUTIL_CAP_DIRECT_XIP             (1<<17)
 #define BOOTUTIL_CAP_HW_ROLLBACK_PROT       (1<<18)
+#define BOOTUTIL_CAP_ECDSA_P384             (1<<19)
 
 /*
  * Query the number of images this bootloader is configured for.  This

boot/bootutil/include/bootutil/crypto/ecdsa.h

@@ -80,8 +80,9 @@
 extern "C" {
 #endif
 
-#if defined(MCUBOOT_USE_TINYCRYPT) || defined(MCUBOOT_USE_MBED_TLS) || defined(MCUBOOT_USE_CC310) \
-    || defined(MCUBOOT_USE_NRF_EXTERNAL_CRYPTO)
+#if (defined(MCUBOOT_USE_TINYCRYPT) || defined(MCUBOOT_USE_MBED_TLS) || \
+     defined(MCUBOOT_USE_CC310) || defined(MCUBOOT_USE_NRF_EXTERNAL_CRYPTO)) \
+     && !defined(MCUBOOT_USE_PSA_CRYPTO)
 /*
  * Declaring these like this adds NULL termination.
  */
@@ -131,7 +132,7 @@ static int bootutil_import_key(uint8_t **cp, uint8_t *end)
 
     return 0;
 }
-#endif /* MCUBOOT_USE_TINYCRYPT || MCUBOOT_USE_MBED_TLS || MCUBOOT_USE_CC310 */
+#endif /* (MCUBOOT_USE_TINYCRYPT || MCUBOOT_USE_MBED_TLS || MCUBOOT_USE_CC310) && !MCUBOOT_USE_PSA_CRYPTO */
 
 /*
  * cp points to ASN1 string containing an integer.

boot/bootutil/include/bootutil/crypto/sha256.h → boot/bootutil/include/bootutil/crypto/sha.h

@@ -18,8 +18,8 @@
  * the MCUBOOT_USE_PSA_CRYPTO will take precedence.
  */
 
-#ifndef __BOOTUTIL_CRYPTO_SHA256_H_
-#define __BOOTUTIL_CRYPTO_SHA256_H_
+#ifndef __BOOTUTIL_CRYPTO_SHA_H_
+#define __BOOTUTIL_CRYPTO_SHA_H_
 
 #include "mcuboot_config/mcuboot_config.h"
 #include "mcuboot_config/mcuboot_logging.h"
@@ -35,8 +35,16 @@
     #error "One crypto backend must be defined: either CC310/MBED_TLS/TINYCRYPT/PSA_CRYPTO"
 #endif
 
+#if defined(MCUBOOT_SIGN_EC384)
+    #define IMAGE_HASH_SIZE (48)
+    #define EXPECTED_HASH_TLV IMAGE_TLV_SHA384
+#else
+    #define IMAGE_HASH_SIZE (32)
+    #define EXPECTED_HASH_TLV IMAGE_TLV_SHA256
+#endif /* MCUBOOT_SIGN_EC384 */
+
 /* Universal defines for SHA-256 */
-#define BOOTUTIL_CRYPTO_SHA256_BLOCK_SIZE (64)
+#define BOOTUTIL_CRYPTO_SHA256_BLOCK_SIZE  (64)
 #define BOOTUTIL_CRYPTO_SHA256_DIGEST_SIZE (32)
 
 #if defined(MCUBOOT_USE_PSA_CRYPTO)
@@ -70,119 +78,129 @@ extern "C" {
 
 #if defined(MCUBOOT_USE_PSA_CRYPTO)
 
-typedef psa_hash_operation_t bootutil_sha256_context;
+typedef psa_hash_operation_t bootutil_sha_context;
 
-static inline int bootutil_sha256_init(bootutil_sha256_context *ctx)
+static inline int bootutil_sha_init(bootutil_sha_context *ctx)
 {
     *ctx = psa_hash_operation_init();
-    return (int)psa_hash_setup(ctx, PSA_ALG_SHA_256);
+#if defined(MCUBOOT_SIGN_EC384)
+    psa_status_t status = psa_hash_setup(ctx, PSA_ALG_SHA_384);
+#else
+    psa_status_t status = psa_hash_setup(ctx, PSA_ALG_SHA_256);
+#endif
+    return (int)status;
 }
 
-static inline int bootutil_sha256_drop(bootutil_sha256_context *ctx)
+static inline int bootutil_sha_drop(bootutil_sha_context *ctx)
 {
     return (int)psa_hash_abort(ctx);
 }
 
-static inline int bootutil_sha256_update(bootutil_sha256_context *ctx,
-                                         const void *data,
-                                         uint32_t data_len)
+static inline int bootutil_sha_update(bootutil_sha_context *ctx,
+                                      const void *data,
+                                      uint32_t data_len)
 {
     return (int)psa_hash_update(ctx, data, data_len);
 }
 
-static inline int bootutil_sha256_finish(bootutil_sha256_context *ctx,
-                                          uint8_t *output)
+static inline int bootutil_sha_finish(bootutil_sha_context *ctx,
+                                      uint8_t *output)
 {
     size_t hash_length = 0;
     /* Assumes the output buffer is at least the expected size of the hash */
+#if defined(MCUBOOT_SIGN_EC384)
+    return (int)psa_hash_finish(ctx, output, PSA_HASH_LENGTH(PSA_ALG_SHA_384), &hash_length);
+#else
     return (int)psa_hash_finish(ctx, output, PSA_HASH_LENGTH(PSA_ALG_SHA_256), &hash_length);
+#endif
 }
 
 #elif defined(MCUBOOT_USE_MBED_TLS)
 
-typedef mbedtls_sha256_context bootutil_sha256_context;
+typedef mbedtls_sha256_context bootutil_sha_context;
 
-static inline int bootutil_sha256_init(bootutil_sha256_context *ctx)
+static inline int bootutil_sha_init(bootutil_sha_context *ctx)
 {
     mbedtls_sha256_init(ctx);
     return mbedtls_sha256_starts_ret(ctx, 0);
 }
 
-static inline int bootutil_sha256_drop(bootutil_sha256_context *ctx)
+static inline int bootutil_sha_drop(bootutil_sha_context *ctx)
 {
     /* XXX: config defines MBEDTLS_PLATFORM_NO_STD_FUNCTIONS so no need to free */
     /* (void)mbedtls_sha256_free(ctx); */
     (void)ctx;
     return 0;
 }
 
-static inline int bootutil_sha256_update(bootutil_sha256_context *ctx,
-                                         const void *data,
-                                         uint32_t data_len)
+static inline int bootutil_sha_update(bootutil_sha_context *ctx,
+                                      const void *data,
+                                      uint32_t data_len)
 {
     return mbedtls_sha256_update_ret(ctx, data, data_len);
 }
 
-static inline int bootutil_sha256_finish(bootutil_sha256_context *ctx,
-                                          uint8_t *output)
+static inline int bootutil_sha_finish(bootutil_sha_context *ctx,
+                                      uint8_t *output)
 {
     return mbedtls_sha256_finish_ret(ctx, output);
 }
 
 #endif /* MCUBOOT_USE_MBED_TLS */
 
 #if defined(MCUBOOT_USE_TINYCRYPT)
-typedef struct tc_sha256_state_struct bootutil_sha256_context;
-static inline int bootutil_sha256_init(bootutil_sha256_context *ctx)
+typedef struct tc_sha256_state_struct bootutil_sha_context;
+
+static inline int bootutil_sha_init(bootutil_sha_context *ctx)
 {
     tc_sha256_init(ctx);
     return 0;
 }
 
-static inline int bootutil_sha256_drop(bootutil_sha256_context *ctx)
+static inline int bootutil_sha_drop(bootutil_sha_context *ctx)
 {
     (void)ctx;
     return 0;
 }
 
-static inline int bootutil_sha256_update(bootutil_sha256_context *ctx,
-                                         const void *data,
-                                         uint32_t data_len)
+static inline int bootutil_sha_update(bootutil_sha_context *ctx,
+                                      const void *data,
+                                      uint32_t data_len)
 {
     return tc_sha256_update(ctx, data, data_len);
 }
 
-static inline int bootutil_sha256_finish(bootutil_sha256_context *ctx,
-                                          uint8_t *output)
+static inline int bootutil_sha_finish(bootutil_sha_context *ctx,
+                                      uint8_t *output)
 {
     return tc_sha256_final(output, ctx);
 }
 #endif /* MCUBOOT_USE_TINYCRYPT */
 
 #if defined(MCUBOOT_USE_CC310)
-static inline int bootutil_sha256_init(bootutil_sha256_context *ctx)
+static inline int bootutil_sha_init(bootutil_sha_context *ctx)
 {
     cc310_sha256_init(ctx);
     return 0;
 }
 
-static inline int bootutil_sha256_drop(bootutil_sha256_context *ctx)
+static inline int bootutil_sha_drop(bootutil_sha_context *ctx)
 {
     (void)ctx;
     nrf_cc310_disable();
     return 0;
 }
 
-static inline int bootutil_sha256_update(bootutil_sha256_context *ctx,
-                                          const void *data,
-                                          uint32_t data_len)
+static inline int bootutil_sha_update(bootutil_sha_context *ctx,
+                                      const void *data,
+                                      uint32_t data_len)
 {
     cc310_sha256_update(ctx, data, data_len);
     return 0;
 }
 
-static inline int bootutil_sha256_finish(bootutil_sha256_context *ctx,
-                                          uint8_t *output)
+static inline int bootutil_sha_finish(bootutil_sha_context *ctx,
+                                      uint8_t *output)
 {
     cc310_sha256_finalize(ctx, output);
     return 0;
@@ -193,27 +211,27 @@ static inline int bootutil_sha256_finish(bootutil_sha256_context *ctx,
 
 #include <bl_crypto.h>
 
-typedef bl_sha256_ctx_t bootutil_sha256_context;
+typedef bl_sha256_ctx_t bootutil_sha_context;
 
-static inline void bootutil_sha256_init(bootutil_sha256_context *ctx)
+static inline void bootutil_sha_init(bootutil_sha_context *ctx)
 {
     bl_sha256_init(ctx);
 }
 
-static inline void bootutil_sha256_drop(bootutil_sha256_context *ctx)
+static inline void bootutil_sha_drop(bootutil_sha_context *ctx)
 {
     (void)ctx;
 }
 
-static inline int bootutil_sha256_update(bootutil_sha256_context *ctx,
-                                          const void *data,
-                                          uint32_t data_len)
+static inline int bootutil_sha_update(bootutil_sha_context *ctx,
+                                      const void *data,
+                                      uint32_t data_len)
 {
     return bl_sha256_update(ctx, data, data_len);
 }
 
-static inline int bootutil_sha256_finish(bootutil_sha256_context *ctx,
-                                          uint8_t *output)
+static inline int bootutil_sha_finish(bootutil_sha_context *ctx,
+                                      uint8_t *output)
 {
     bl_sha256_finalize(ctx, output);
     return 0;
@@ -224,4 +242,4 @@ static inline int bootutil_sha256_finish(bootutil_sha256_context *ctx,
 }
 #endif
 
-#endif /* __BOOTUTIL_CRYPTO_SHA256_H_ */
+#endif /* __BOOTUTIL_CRYPTO_SHA_H_ */