add build option to skip verification of boot image

Author: bigbrett

options.mk

@@ -685,6 +685,10 @@ ifeq ($(ALLOW_DOWNGRADE),1)
   CFLAGS+= -D"ALLOW_DOWNGRADE"
 endif
 
+ifeq ($(WOLFBOOT_SKIP_BOOT_VERIFY),1)
+  CFLAGS+=-D"WOLFBOOT_SKIP_BOOT_VERIFY"
+endif
+
 ifeq ($(NVM_FLASH_WRITEONCE),1)
   CFLAGS+= -D"NVM_FLASH_WRITEONCE"
 endif

src/update_disk.c

@@ -425,6 +425,7 @@ void RAMFUNCTION wolfBoot_start(void)
         }
         os_image.fw_base = (uint8_t*)load_address;
 
+#ifndef WOLFBOOT_SKIP_BOOT_VERIFY
         wolfBoot_printf("Checking image integrity...");
         BENCHMARK_START();
         if (wolfBoot_verify_integrity(&os_image) != 0) {
@@ -446,6 +447,10 @@ void RAMFUNCTION wolfBoot_start(void)
             failures = 0;
             break; /* Success case */
         }
+#else
+        failures = 0;
+        break; /* Skip verification, boot directly */
+#endif
     } while (failures < MAX_FAILURES);
 
     if (failures) {

src/update_flash.c

@@ -1346,6 +1346,7 @@ void RAMFUNCTION wolfBoot_start(void)
     wolfBoot_printf("Booting version: 0x%x\n",
         wolfBoot_get_blob_version(boot.hdr));
 
+#ifndef WOLFBOOT_SKIP_BOOT_VERIFY
     if (bootRet < 0
             || (wolfBoot_verify_integrity(&boot) < 0)
             || (wolfBoot_verify_authenticity(&boot) < 0)
@@ -1377,6 +1378,11 @@ void RAMFUNCTION wolfBoot_start(void)
         }
     }
     PART_SANITY_CHECK(&boot);
+#else
+    if (bootRet < 0) {
+        wolfBoot_panic();
+    }
+#endif
 
 #ifdef WOLFBOOT_ELF_FLASH_SCATTER
     unsigned long entry;

src/update_flash_hwswap.c

@@ -51,10 +51,12 @@ void RAMFUNCTION wolfBoot_start(void)
         boot_panic();
 
     for (;;) {
-        if ((wolfBoot_open_image(&fw_image, active) < 0) ||
-            (wolfBoot_verify_integrity(&fw_image) < 0) ||
-            (wolfBoot_verify_authenticity(&fw_image) < 0)) {
-
+        if ((wolfBoot_open_image(&fw_image, active) < 0)
+#ifndef WOLFBOOT_SKIP_BOOT_VERIFY
+            || (wolfBoot_verify_integrity(&fw_image) < 0)
+            || (wolfBoot_verify_authenticity(&fw_image) < 0)
+#endif
+        ) {
             /* panic if authentication fails and no backup */
             if (!wolfBoot_fallback_is_possible())
                 boot_panic();

src/update_ram.c

@@ -192,6 +192,7 @@ void RAMFUNCTION wolfBoot_start(void)
             goto backup_on_failure;
         }
 
+#ifndef WOLFBOOT_SKIP_BOOT_VERIFY
         /* Verify image integrity (hash check) */
         wolfBoot_printf("Checking integrity...");
         BENCHMARK_START();
@@ -211,6 +212,7 @@ void RAMFUNCTION wolfBoot_start(void)
             goto backup_on_failure;
         }
         BENCHMARK_END("done");
+#endif
 
         {
             /* Success - integrity and signature valid */