Upmerge 2024.12.20

.github/workflows/imgtool.yaml

@@ -35,13 +35,14 @@ jobs:
         pipenv run pip install pytest -e .
         pipenv run pytest --junitxml=../junit/pytest-results-${{ matrix.python-version }}.xml
     - name: Upload test results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: pytest-results-${{ matrix.python-version }}
         path: |
           junit/pytest-results-${{ matrix.python-version }}*.xml
         if-no-files-found: ignore
+        overwrite: true
   environment:
     if: ${{ github.event_name == 'push' }}
     runs-on: ubuntu-latest
@@ -50,7 +51,7 @@ jobs:
       with:
         fetch-depth: 0
     - name: Cache pip
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pip
         key: ${{ runner.os }}-pip

.github/workflows/issue.yml

@@ -0,0 +1,20 @@
+name: Issue assignment
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  move-to-todo:
+    runs-on: ubuntu-latest
+    if: github.repository == 'mcu-tools/mcuboot'
+    steps:
+      - uses: fojia/action-move-issues-to-column@master
+        with:
+          project: 'Issue Tracking'
+          column: 'No Status'
+          owner: 'mcu-tools'
+          repo: 'mcuboot'
+          type: 'repo'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          marker: 'issue:todo'

.github/workflows/issue_closed.yml

@@ -0,0 +1,19 @@
+name: Issue closed
+
+on:
+  issues:
+    types: [close]
+
+jobs:
+  move-to-todo:
+    runs-on: ubuntu-latest
+    if: github.repository == 'mcu-tools/mcuboot'
+    steps:
+      - uses: fojia/action-move-issues-to-column@master
+        with:
+          project: 'MCUboot releases'
+          column: 'Done'
+          owner: 'mcu-tools'
+          repo: 'mcuboot'
+          type: 'repo'
+          github_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/mynewt.yaml

@@ -18,6 +18,9 @@ jobs:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
+    - uses: actions/setup-go@v3
+      with:
+        go-version: 'stable'
     - name: Print the environment
       run: |
         uname -a

.github/workflows/zephyr_build.yaml

@@ -40,12 +40,12 @@ jobs:
     runs-on: ubuntu-latest
     # Docker image from the zephyr upstream. Includes SDK and other required tools
     container:
-      image: zephyrprojectrtos/ci:v0.26.4
+      image: zephyrprojectrtos/ci:v0.27.4
       options: '--entrypoint /bin/bash'
       volumes:
         - /home/runners/zephyrproject:/github/cache/zephyrproject
     env:
-      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.16.1
+      ZEPHYR_SDK_INSTALL_DIR: /opt/toolchains/zephyr-sdk-0.17.0
 
     steps:
       - name: Set versions when workflow_dispatch
@@ -69,6 +69,7 @@ jobs:
       - name: Setup Zephyr
         working-directory: repos/zephyr
         run: |
+          west config --system manifest.project-filter -- -.*,+cmsis,+hal_nordic,+hal_nxp,+hal_stm32,+libmetal,+littlefs,+mbedtls,+mcuboot,+open-amp,+picolibc,+segger,+tinycrypt,+trusted-firmware-m,+zcbor
           west init -l .
           west update
 

CODEOWNERS

@@ -0,0 +1,10 @@
+* @d3zd3z
+boot/boot_serial/ @nordicjm @de-nordic
+boot/bootutil/ @davidvincze
+boot/cypress/ @romanjoe
+boot/espressif/ @almir-okato
+boot/mynewt/ @kasjer
+boot/nuttx/ @michallenc
+boot/zcbor/ @nordicjm @de-nordic
+boot/zephyr/ @nordicjm @de-nordic
+zephyr/ @nordicjm @de-nordic

boot/boot_serial/src/boot_serial.c

@@ -286,7 +286,7 @@ bs_list(char *buf, int len)
         int swap_status = boot_swap_type_multi(image_index);
 #endif
 
-        for (slot = 0; slot < MCUBOOT_IMAGE_NUMBER; slot++) {
+        for (slot = 0; slot < BOOT_NUM_SLOTS; slot++) {
             FIH_DECLARE(fih_rc, FIH_FAILURE);
             uint8_t tmpbuf[64];
 
@@ -621,13 +621,13 @@ bs_slot_info(uint8_t op, char *buf, int len)
     zcbor_list_start_encode(cbor_state, MCUBOOT_IMAGE_NUMBER);
 
     IMAGES_ITER(image_index) {
-        for (slot = 0; slot < MCUBOOT_IMAGE_NUMBER; slot++) {
+        for (slot = 0; slot < BOOT_NUM_SLOTS; slot++) {
             if (slot == 0) {
                     ok = zcbor_map_start_encode(cbor_state, CBOR_ENTRIES_SLOT_INFO_IMAGE_MAP) &&
                          zcbor_tstr_put_lit(cbor_state, "image") &&
                          zcbor_uint32_put(cbor_state, (uint32_t)image_index) &&
                          zcbor_tstr_put_lit(cbor_state, "slots") &&
-                         zcbor_list_start_encode(cbor_state, MCUBOOT_IMAGE_NUMBER);
+                         zcbor_list_start_encode(cbor_state, BOOT_NUM_SLOTS);
 
                     if (!ok) {
                             goto finish;
@@ -691,8 +691,8 @@ bs_slot_info(uint8_t op, char *buf, int len)
                             goto finish;
                     }
 
-                    if (slot == (MCUBOOT_IMAGE_NUMBER - 1)) {
-                        ok = zcbor_list_end_encode(cbor_state, MCUBOOT_IMAGE_NUMBER);
+                    if (slot == (BOOT_NUM_SLOTS - 1)) {
+                        ok = zcbor_list_end_encode(cbor_state, BOOT_NUM_SLOTS);
 
                         if (!ok) {
                             goto finish;
@@ -791,7 +791,7 @@ bs_upload(char *buf, int len)
     const uint8_t *img_chunk = NULL;    /* Pointer to buffer with received image chunk */
     size_t img_chunk_len = 0;           /* Length of received image chunk */
     size_t img_chunk_off = SIZE_MAX;    /* Offset of image chunk within image  */
-    uint8_t rem_bytes;                  /* Reminder bytes after aligning chunk write to
+    size_t rem_bytes;                   /* Reminder bytes after aligning chunk write to
                                          * to flash alignment */
     uint32_t img_num_tmp = UINT_MAX;    /* Temp variable for image number */
     static uint32_t img_num = 0;
@@ -958,7 +958,7 @@ bs_upload(char *buf, int len)
     if (flash_area_align(fap) > 1 &&
         (((size_t)img_chunk) & (flash_area_align(fap) - 1)) != 0) {
         /* Buffer address incompatible with write address, use buffer to write */
-        uint8_t write_size = MCUBOOT_SERIAL_UNALIGNED_BUFFER_SIZE;
+        size_t write_size = MCUBOOT_SERIAL_UNALIGNED_BUFFER_SIZE;
         uint8_t wbs_aligned[MCUBOOT_SERIAL_UNALIGNED_BUFFER_SIZE];
 
         while (img_chunk_len >= flash_area_align(fap)) {

boot/bootutil/CMakeLists.txt

@@ -33,3 +33,9 @@ target_sources(bootutil
         src/swap_scratch.c
         src/tlv.c
 )
+if(CONFIG_BOOT_RAM_LOAD)
+    target_sources(bootutil
+        PRIVATE
+            src/ram_load.c
+    )
+endif()

boot/bootutil/include/bootutil/boot_status.h

@@ -128,7 +128,8 @@ enum mcuboot_mode {
     MCUBOOT_MODE_DIRECT_XIP,
     MCUBOOT_MODE_DIRECT_XIP_WITH_REVERT,
     MCUBOOT_MODE_RAM_LOAD,
-    MCUBOOT_MODE_FIRMWARE_LOADER
+    MCUBOOT_MODE_FIRMWARE_LOADER,
+    MCUBOOT_MODE_SINGLE_SLOT_RAM_LOAD,
 };
 
 enum mcuboot_signature_type {

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

@@ -56,7 +56,12 @@
 
 #elif defined(MCUBOOT_USE_MBED_TLS)
 
+#ifdef MCUBOOT_SHA512
+#include <mbedtls/sha512.h>
+#else
 #include <mbedtls/sha256.h>
+#endif
+
 #include <mbedtls/version.h>
 #if MBEDTLS_VERSION_NUMBER >= 0x03000000
 #include <mbedtls/compat-2.x.h>
@@ -124,31 +129,65 @@ static inline int bootutil_sha_finish(bootutil_sha_context *ctx,
 
 #elif defined(MCUBOOT_USE_MBED_TLS)
 
+#ifdef MCUBOOT_SHA512
+typedef mbedtls_sha512_context bootutil_sha_context;
+#else
 typedef mbedtls_sha256_context bootutil_sha_context;
+#endif
 
 static inline int bootutil_sha_init(bootutil_sha_context *ctx)
 {
+    int ret;
+
+#ifdef MCUBOOT_SHA512
+    mbedtls_sha512_init(ctx);
+    ret = mbedtls_sha512_starts_ret(ctx, 0);
+#else
     mbedtls_sha256_init(ctx);
-    return mbedtls_sha256_starts_ret(ctx, 0);
+    ret = mbedtls_sha256_starts_ret(ctx, 0);
+#endif
+
+    return ret;
 }
 
 static inline int bootutil_sha_drop(bootutil_sha_context *ctx)
 {
+#ifdef MCUBOOT_SHA512
+    mbedtls_sha512_free(ctx);
+#else
     mbedtls_sha256_free(ctx);
+#endif
+
     return 0;
 }
 
 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);
+    int ret;
+
+#ifdef MCUBOOT_SHA512
+    ret = mbedtls_sha512_update_ret(ctx, data, data_len);
+#else
+    ret = mbedtls_sha256_update_ret(ctx, data, data_len);
+#endif
+
+    return ret;
 }
 
 static inline int bootutil_sha_finish(bootutil_sha_context *ctx,
                                       uint8_t *output)
 {
-    return mbedtls_sha256_finish_ret(ctx, output);
+    int ret;
+
+#ifdef MCUBOOT_SHA512
+    ret = mbedtls_sha512_finish_ret(ctx, output);
+#else
+    ret = mbedtls_sha256_finish_ret(ctx, output);
+#endif
+
+    return ret;
 }
 
 #endif /* MCUBOOT_USE_MBED_TLS */

boot/bootutil/pkg.yml

@@ -45,6 +45,9 @@ pkg.ign_files.BOOTUTIL_SINGLE_APPLICATION_SLOT:
     - "loader.c"
     - "swap_scratch.c"
 
+pkg.ign_files:
+    - "ram_load.c"
+
 pkg.deps.BOOTUTIL_USE_MBED_TLS:
     - "@apache-mynewt-core/crypto/mbedtls"
 

boot/bootutil/src/boot_record.c

@@ -32,6 +32,10 @@
 #include "bootutil/image.h"
 #include "flash_map_backend/flash_map_backend.h"
 
+#if defined(MCUBOOT_DATA_SHARING_BOOTINFO)
+static bool saved_bootinfo = false;
+#endif
+
 #if !defined(MCUBOOT_CUSTOM_DATA_SHARING_FUNCTION)
 /**
  * @var shared_memory_init_done
@@ -233,7 +237,9 @@ int boot_save_shared_data(const struct image_header *hdr, const struct flash_are
                           const uint8_t slot, const struct image_max_size *max_app_sizes)
 {
     int rc;
+#if !defined(MCUBOOT_SINGLE_APPLICATION_SLOT)
     uint8_t image = 0;
+#endif
 
 #if defined(MCUBOOT_SINGLE_APPLICATION_SLOT)
     uint8_t mode = MCUBOOT_MODE_SINGLE_SLOT;
@@ -253,6 +259,8 @@ int boot_save_shared_data(const struct image_header *hdr, const struct flash_are
     uint8_t mode = MCUBOOT_MODE_RAM_LOAD;
 #elif defined(MCUBOOT_FIRMWARE_LOADER)
     uint8_t mode = MCUBOOT_MODE_FIRMWARE_LOADER;
+#elif defined(MCUBOOT_SINGLE_APPLICATION_SLOT_RAM_LOAD)
+    uint8_t mode = MCUBOOT_MODE_SINGLE_SLOT_RAM_LOAD;
 #else
 #error "Unknown mcuboot operating mode"
 #endif
@@ -294,6 +302,11 @@ int boot_save_shared_data(const struct image_header *hdr, const struct flash_are
     };
 #endif
 
+    if (saved_bootinfo) {
+        /* Boot info has already been saved, nothing to do */
+        return 0;
+    }
+
     /* Write out all fields */
     rc = boot_add_data_to_shared_area(TLV_MAJOR_BLINFO, BLINFO_MODE,
                                       sizeof(mode), &mode);
@@ -311,11 +324,13 @@ int boot_save_shared_data(const struct image_header *hdr, const struct flash_are
                                           sizeof(recovery), &recovery);
     }
 
+#if !defined(MCUBOOT_SINGLE_APPLICATION_SLOT)
     if (!rc) {
         rc = boot_add_data_to_shared_area(TLV_MAJOR_BLINFO,
                                           BLINFO_RUNNING_SLOT,
                                           sizeof(slot), (void *)&slot);
     }
+#endif
 
 #if defined(MCUBOOT_VERSION_AVAILABLE)
     if (!rc) {
@@ -326,6 +341,7 @@ int boot_save_shared_data(const struct image_header *hdr, const struct flash_are
     }
 #endif
 
+#if !defined(MCUBOOT_SINGLE_APPLICATION_SLOT)
     while (image < BOOT_IMAGE_NUMBER && !rc) {
         if (max_app_sizes[image].calculated == true) {
             rc = boot_add_data_to_shared_area(TLV_MAJOR_BLINFO,
@@ -337,6 +353,11 @@ int boot_save_shared_data(const struct image_header *hdr, const struct flash_are
 
         ++image;
     }
+#endif
+
+    if (!rc) {
+        saved_bootinfo = true;
+    }
 
     return rc;
 }