synch with upstream a513b8e

    Synchronized up to:
    mcu-tools/mcuboot@a513b8e

    - fix build issue caused by that CONFIG_LOG_MINIMAL was replaced by CONFIG_LOG_MODE_MINIMAL
    - imgtool: fix validation with protected TLVs

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

Author: nvlsianpu

boot/zephyr/boards/circuitdojo_feather_nrf9160.conf

@@ -3,6 +3,9 @@ CONFIG_CONSOLE=n
 CONFIG_CONSOLE_HANDLER=n
 CONFIG_UART_CONSOLE=n
 
+# Multithreading
+CONFIG_MULTITHREADING=y
+
 # MCUBoot settings
 CONFIG_BOOT_MAX_IMG_SECTORS=256
 
@@ -11,3 +14,6 @@ CONFIG_MCUBOOT_SERIAL=y
 CONFIG_BOOT_SERIAL_DETECT_PORT="GPIO_0"
 CONFIG_BOOT_SERIAL_DETECT_PIN=12
 CONFIG_BOOT_SERIAL_DETECT_PIN_VAL=0
+
+# Size of mcuboot partition
+CONFIG_SIZE_OPTIMIZATIONS=y

boot/zephyr/boards/sparkfun_thing_plus_nrf9160.conf

@@ -0,0 +1,19 @@
+# Disable Zephyr console
+CONFIG_CONSOLE=n
+CONFIG_CONSOLE_HANDLER=n
+CONFIG_UART_CONSOLE=n
+
+# Multithreading
+CONFIG_MULTITHREADING=y
+
+# MCUBoot settings
+CONFIG_BOOT_MAX_IMG_SECTORS=256
+
+# MCUboot serial recovery
+CONFIG_MCUBOOT_SERIAL=y
+CONFIG_BOOT_SERIAL_DETECT_PORT="GPIO_0"
+CONFIG_BOOT_SERIAL_DETECT_PIN=12
+CONFIG_BOOT_SERIAL_DETECT_PIN_VAL=0
+
+# Size of mcuboot partition
+CONFIG_SIZE_OPTIMIZATIONS=y

boot/zephyr/main.c

@@ -51,8 +51,14 @@ const struct boot_uart_funcs boot_funcs = {
 #include <arm_cleanup.h>
 #endif
 
+/* CONFIG_LOG_MINIMAL is the legacy Kconfig property,
+ * replaced by CONFIG_LOG_MODE_MINIMAL.
+ */
+#define ZEPHYR_LOG_MODE_MINIMAL (defined(CONFIG_LOG_MODE_MINIMAL) ||\
+                                 defined(CONFIG_LOG_MINIMAL))
+
 #if defined(CONFIG_LOG) && !defined(CONFIG_LOG_IMMEDIATE) && \
-    !defined(CONFIG_LOG_MINIMAL)
+    !ZEPHYR_LOG_MODE_MINIMAL
 #ifdef CONFIG_LOG_PROCESS_THREAD
 #warning "The log internal thread for log processing can't transfer the log"\
          "well for MCUBoot."
@@ -259,7 +265,7 @@ static void do_boot(struct boot_rsp *rsp)
 #endif
 
 #if defined(CONFIG_LOG) && !defined(CONFIG_LOG_IMMEDIATE) &&\
-    !defined(CONFIG_LOG_PROCESS_THREAD) && !defined(CONFIG_LOG_MINIMAL)
+    !defined(CONFIG_LOG_PROCESS_THREAD) && !ZEPHYR_LOG_MODE_MINIMAL
 /* The log internal thread for log processing can't transfer log well as has too
  * low priority.
  * Dedicated thread for log processing below uses highest application

boot/zephyr/prj.conf

@@ -31,7 +31,7 @@ CONFIG_FLASH=y
 # CONFIG_I2C is not set
 
 CONFIG_LOG=y
-CONFIG_LOG_MINIMAL=y
+CONFIG_LOG_MODE_MINIMAL=y # former CONFIG_MODE_MINIMAL
 ### Ensure Zephyr logging changes don't use more resources
 CONFIG_LOG_DEFAULT_LEVEL=0
 ### Decrease footprint by ~4 KB in comparison to CBPRINTF_COMPLETE=y

scripts/imgtool/image.py

@@ -544,16 +544,22 @@ def verify(imgfile, key):
         if magic != IMAGE_MAGIC:
             return VerifyResult.INVALID_MAGIC, None, None
 
-        tlv_info = b[header_size+img_size:header_size+img_size+TLV_INFO_SIZE]
+        tlv_off = header_size + img_size
+        tlv_info = b[tlv_off:tlv_off+TLV_INFO_SIZE]
         magic, tlv_tot = struct.unpack('HH', tlv_info)
+        if magic == TLV_PROT_INFO_MAGIC:
+            tlv_off += tlv_tot
+            tlv_info = b[tlv_off:tlv_off+TLV_INFO_SIZE]
+            magic, tlv_tot = struct.unpack('HH', tlv_info)
+
         if magic != TLV_INFO_MAGIC:
             return VerifyResult.INVALID_TLV_INFO_MAGIC, None, None
 
         sha = hashlib.sha256()
-        sha.update(b[:header_size+img_size])
+        prot_tlv_size = tlv_off
+        sha.update(b[:prot_tlv_size])
         digest = sha.digest()
 
-        tlv_off = header_size + img_size
         tlv_end = tlv_off + tlv_tot
         tlv_off += TLV_INFO_SIZE  # skip tlv info
         while tlv_off < tlv_end:
@@ -569,7 +575,7 @@ def verify(imgfile, key):
             elif key is not None and tlv_type == TLV_VALUES[key.sig_tlv()]:
                 off = tlv_off + TLV_SIZE
                 tlv_sig = b[off:off+tlv_len]
-                payload = b[:header_size+img_size]
+                payload = b[:prot_tlv_size]
                 try:
                     if hasattr(key, 'verify'):
                         key.verify(tlv_sig, payload)