Addressed copilot's comments

Author: danielinux

include/encrypt.h

@@ -86,7 +86,6 @@ int ext_flash_decrypt_read(uintptr_t address, uint8_t *data, int len);
 
 #ifdef EXT_ENCRYPTED
 int wolfBoot_enable_fallback_iv(int enable);
-int wolfBoot_force_fallback_iv(int enable);
 void wolfBoot_crypto_set_iv(const uint8_t *nonce, uint32_t iv_counter);
 #endif
 

src/update_flash.c

@@ -31,6 +31,9 @@
 
 #include "delta.h"
 #include "printf.h"
+#ifdef EXT_ENCRYPTED
+int wolfBoot_force_fallback_iv(int enable);
+#endif
 #ifdef WOLFBOOT_TPM
 #include "tpm.h"
 #endif

tools/unit-tests/unit-mock-flash.c

@@ -163,16 +163,17 @@ int ext_flash_write(uintptr_t address, const uint8_t *data, int len)
     int i;
     uint8_t *a = (uint8_t *)address;
     ck_assert_msg(!ext_locked, "Attempting to write to a locked FLASH");
+    ck_assert_msg(len >= 0, "ext_flash_write invalid len %d", len);
     ck_assert_msg(
         ((address >= WOLFBOOT_PARTITION_BOOT_ADDRESS) &&
-         (address + (uintptr_t)len <=
-          WOLFBOOT_PARTITION_BOOT_ADDRESS + WOLFBOOT_PARTITION_SIZE)) ||
+         ((uintptr_t)len <=
+          WOLFBOOT_PARTITION_BOOT_ADDRESS + WOLFBOOT_PARTITION_SIZE - address)) ||
         ((address >= WOLFBOOT_PARTITION_UPDATE_ADDRESS) &&
-         (address + (uintptr_t)len <=
-          WOLFBOOT_PARTITION_UPDATE_ADDRESS + WOLFBOOT_PARTITION_SIZE)) ||
+         ((uintptr_t)len <=
+          WOLFBOOT_PARTITION_UPDATE_ADDRESS + WOLFBOOT_PARTITION_SIZE - address)) ||
         ((address >= WOLFBOOT_PARTITION_SWAP_ADDRESS) &&
-         (address + (uintptr_t)len <=
-          WOLFBOOT_PARTITION_SWAP_ADDRESS + WOLFBOOT_SECTOR_SIZE)),
+         ((uintptr_t)len <=
+          WOLFBOOT_PARTITION_SWAP_ADDRESS + WOLFBOOT_SECTOR_SIZE - address)),
         "ext_flash_write address out of range: %p len %d",
         (void*)address, len);
     for (i = 0; i < len; i++) {

tools/unit-tests/unit-update-flash.c

@@ -700,8 +700,10 @@ Suite *wolfboot_suite(void)
 
 
 #ifdef UNIT_TEST_FALLBACK_ONLY
+#ifdef EXT_ENCRYPTED
     tcase_add_test(fallback_verify, test_fallback_image_verification_rejects_corruption);
     suite_add_tcase(s, fallback_verify);
+#endif
     return s;
 #else
     tcase_add_test(empty_panic, test_empty_panic);