Fixed regressions in CI tests

Author: danielinux

src/update_flash.c

@@ -45,6 +45,15 @@ int WP11_Library_Init(void);
 
 #ifdef EXT_ENCRYPTED
 #include "encrypt.h"
+
+static void wolfBoot_zeroize(void *ptr, size_t len)
+{
+    volatile uint8_t *p = (volatile uint8_t *)ptr;
+
+    while (len-- > 0) {
+        *p++ = 0;
+    }
+}
 #endif /* EXT_ENCRYPTED */
 
 #ifdef MMU
@@ -307,8 +316,8 @@ static int RAMFUNCTION wolfBoot_copy_sector(struct wolfBoot_image *src,
 out:
 #endif
 #ifdef EXT_ENCRYPTED
-    ForceZero(key, sizeof(key));
-    ForceZero(nonce, sizeof(nonce));
+    wolfBoot_zeroize(key, sizeof(key));
+    wolfBoot_zeroize(nonce, sizeof(nonce));
 #endif
     return ret;
 }
@@ -365,8 +374,8 @@ static int RAMFUNCTION wolfBoot_backup_last_boot_sector(uint32_t sector)
         ret = wolfBoot_copy_sector(src, dst, sector);
     }
 out:
-    ForceZero(key, sizeof(key));
-    ForceZero(nonce, sizeof(nonce));
+    wolfBoot_zeroize(key, sizeof(key));
+    wolfBoot_zeroize(nonce, sizeof(nonce));
     return ret;
 }
 #else
@@ -722,8 +731,8 @@ static int wolfBoot_delta_update(struct wolfBoot_image *boot,
     }
 out:
 #ifdef EXT_ENCRYPTED
-    ForceZero(key, sizeof(key));
-    ForceZero(nonce, sizeof(nonce));
+    wolfBoot_zeroize(key, sizeof(key));
+    wolfBoot_zeroize(nonce, sizeof(nonce));
 #endif
 #ifdef EXT_FLASH
     ext_flash_lock();

tools/unit-tests/unit-extflash.c

@@ -94,7 +94,7 @@ uint8_t flash[FLASH_SIZE];
 
 /* Mocks for ext_flash_read, ext_flash_write, and ext_flash_erase functions */
 int ext_flash_read(uintptr_t address, uint8_t *data, int len) {
-    printf("Called ext_flash_read %p %p %d\n", address, data, len);
+    printf("Called ext_flash_read %p %p %d\n", (void *)address, (void *)data, len);
 
     /* Check that the read address and size are within the bounds of the flash memory */
     ck_assert_int_le(address + len, FLASH_SIZE);
@@ -106,7 +106,7 @@ int ext_flash_read(uintptr_t address, uint8_t *data, int len) {
 }
 
 int ext_flash_write(uintptr_t address, const uint8_t *data, int len) {
-    printf("Called ext_flash_write %p %p %d\n", address, data, len);
+    printf("Called ext_flash_write %p %p %d\n", (void *)address, (const void *)data, len);
 
 
     /* Check that the write address and size are within the bounds of the flash memory */