[nrf noup] Add routines for application

Adapt manifest headers, so they can be used by the main application.

Signed-off-by: Tomasz Chyrowicz <[email protected]>

Author: tomchy

boot/bootutil/include/bootutil/mcuboot_manifest.h

@@ -15,7 +15,29 @@
 
 #include <stdint.h>
 #include "bootutil/bootutil.h"
+#ifdef CONFIG_MCUBOOT
 #include "bootutil/crypto/sha.h"
+#elif defined(CONFIG_MCUBOOT_BOOTLOADER_USES_SHA512)
+    #define IMAGE_HASH_SIZE (64)
+#else
+    #define IMAGE_HASH_SIZE (32)
+#endif
+
+#ifndef MCUBOOT_MANIFEST_IMAGE_NUMBER
+#ifdef CONFIG_NCS_MCUBOOT_MANIFEST_IMAGE_NUMBER
+#define MCUBOOT_MANIFEST_IMAGE_NUMBER CONFIG_NCS_MCUBOOT_MANIFEST_IMAGE_NUMBER
+#else
+#error "MCUBOOT_MANIFEST_IMAGE_NUMBER must be defined when MCUBOOT_MANIFEST_UPDATES is enabled"
+#endif
+#endif
+
+#ifndef MCUBOOT_IMAGE_NUMBER
+#ifdef CONFIG_UPDATEABLE_IMAGE_NUMBER
+#define MCUBOOT_IMAGE_NUMBER CONFIG_UPDATEABLE_IMAGE_NUMBER
+#else
+#error "MCUBOOT_IMAGE_NUMBER must be defined when MCUBOOT_MANIFEST_UPDATES is enabled"
+#endif
+#endif
 
 #ifndef __packed
 #define __packed __attribute__((__packed__))

boot/bootutil/src/bootutil_public.c

@@ -56,6 +56,10 @@
 #define SEND_BOOT_REQUEST
 #endif /* CONFIG_NRF_MCUBOOT_BOOT_REQUEST && !CONFIG_MCUBOOT */
 
+#ifdef CONFIG_NCS_MCUBOOT_MANIFEST_UPDATES
+#include <bootutil/mcuboot_manifest.h>
+#endif /* CONFIG_NCS_MCUBOOT_MANIFEST_UPDATES */
+
 #ifdef CONFIG_MCUBOOT
 BOOT_LOG_MODULE_DECLARE(mcuboot);
 #else
@@ -398,7 +402,8 @@ boot_write_image_ok(const struct flash_area *fap)
     return boot_write_trailer_flag(fap, off, BOOT_FLAG_SET);
 }
 
-#if defined(SEND_BOOT_REQUEST) || (!defined(MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP))
+#if defined(SEND_BOOT_REQUEST) || (!defined(MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP)) || \
+    defined(CONFIG_NCS_MCUBOOT_MANIFEST_UPDATES)
 static int flash_area_to_image_slot(const struct flash_area *fa, uint32_t *slot)
 {
     int id = flash_area_get_id(fa);
@@ -435,15 +440,36 @@ static int flash_area_to_image_slot(const struct flash_area *fa, uint32_t *slot)
 #endif
     return 0;
 }
-#endif /* SEND_BOOT_REQUEST || !MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP */
+#endif /* SEND_BOOT_REQUEST || !MCUBOOT_BOOTUTIL_LIB_FOR_DIRECT_XIP || CONFIG_NCS_MCUBOOT_MANIFEST_UPDATES */
 
 int
 boot_read_image_ok(const struct flash_area *fap, uint8_t *image_ok)
 {
-#ifdef SEND_BOOT_REQUEST
+#if defined(SEND_BOOT_REQUEST) || defined(CONFIG_NCS_MCUBOOT_MANIFEST_UPDATES)
     enum boot_slot slot_id = BOOT_SLOT_NONE;
     int image_id = flash_area_to_image_slot(fap, &slot_id);
-    bool confirm_pending = boot_request_check_confirmed_slot(image_id, slot_id);
+#endif
+#ifdef SEND_BOOT_REQUEST
+    bool confirm_pending;
+#endif
+
+#ifdef CONFIG_NCS_MCUBOOT_MANIFEST_UPDATES
+    /* If manifest-based updates are used, only the manifest image is considered. */
+    image_id = CONFIG_NCS_MCUBOOT_MANIFEST_IMAGE_NUMBER;
+    if (slot_id == BOOT_SLOT_PRIMARY) {
+        int rc = flash_area_open(FLASH_AREA_IMAGE_PRIMARY(image_id), &fap);
+        if (rc != 0) {
+            return rc;
+        }
+    } else if (slot_id == BOOT_SLOT_SECONDARY) {
+        int rc = flash_area_open(FLASH_AREA_IMAGE_SECONDARY(image_id), &fap);
+        if (rc != 0) {
+            return rc;
+        }
+    }
+#endif /* CONFIG_NCS_MCUBOOT_MANIFEST_UPDATES */
+#ifdef SEND_BOOT_REQUEST
+    confirm_pending = boot_request_check_confirmed_slot(image_id, slot_id);
 
     if (confirm_pending) {
         BOOT_LOG_DBG("Image confirmation pending for image %d slot %d", image_id, slot_id);