Fixes for getting benchmark to run in test-app.

Author: dgarske

include/user_settings.h

@@ -486,7 +486,9 @@ extern int tolower(int c);
     #define NO_AES_CBC
 #else
     #if defined(WOLFCRYPT_TEST) || defined(WOLFCRYPT_BENCHMARK)
-        /* Use custom RNG for tests (saves ~7KB vs HASHDRBG) */
+        /* Use custom RNG for tests/benchmarks (saves ~7KB vs HASHDRBG).
+         * WARNING: my_rng_seed_gen is NOT cryptographically secure.
+         * Only used in test-app builds, not in production wolfBoot. */
         #define WC_NO_HASHDRBG
         #define CUSTOM_RAND_GENERATE_SEED my_rng_seed_gen
         #define CUSTOM_RAND_GENERATE_BLOCK my_rng_seed_gen

test-app/Makefile

@@ -133,6 +133,9 @@ ifeq ($(WOLFCRYPT_SUPPORT),1)
   # Add RNG support (needed for ECC signing and tests)
   APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/random.o
 
+  # Add AES support (needed by benchmark for AES-CBC etc.)
+  APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/aes.o
+
   # Add ECC support (needed by test suite)
   APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/ecc.o
   APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/sp_int.o
@@ -398,7 +401,11 @@ ifeq ($(TARGET),va416x0)
     APP_OBJS+=../src/keystore.o
   endif
   # Reduce size: newlib-nano and section GC
-  LDFLAGS+=--specs=nano.specs --specs=nosys.specs
+  LDFLAGS+=--specs=nano.specs
+  ifneq ($(WOLFCRYPT_SUPPORT),1)
+    # Only use nosys stubs when not providing our own syscalls
+    LDFLAGS+=--specs=nosys.specs
+  endif
   ifeq ($(WOLFCRYPT_BENCHMARK),1)
     # Benchmark needs float printf for results
     LDFLAGS+=-u _printf_float

test-app/syscalls.c

@@ -21,6 +21,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
  */
 
+#include <stdint.h>
 #include <sys/stat.h>
 #include <errno.h>
 
@@ -29,7 +30,7 @@ extern int errno;
 
 /* Heap management */
 extern char _end; /* Defined by linker */
-extern char _Min_Heap_Size; /* Defined by linker (if available) */
+extern char _Min_Heap_Size; /* Linker symbol: address is the value */
 
 char *__env[1] = { 0 };
 char **environ = __env;
@@ -71,8 +72,9 @@ void *_sbrk(int incr)
     }
     prev_heap_end = heap_end;
 
-    /* Calculate heap limit */
-    heap_limit = &_end + _Min_Heap_Size;
+    /* Calculate heap limit: _Min_Heap_Size is a linker symbol whose
+     * address represents the size value */
+    heap_limit = &_end + (uintptr_t)&_Min_Heap_Size;
 
     if (heap_end + incr > heap_limit) {
         errno = ENOMEM;

test-app/wcs/user_settings.h

@@ -147,7 +147,9 @@ extern int tolower(int c);
 #define NO_ERROR_STRINGS
 #define NO_KDF
 
-#define WC_TEST_NO_CRYPTOCB_SW_TEST
+#ifdef WOLF_CRYPTO_CB
+    #define WC_TEST_NO_CRYPTOCB_SW_TEST
+#endif
 #define BENCH_EMBEDDED
 
 #define HAVE_ECC_KEY_EXPORT

tools/keytools/sign.c

@@ -1744,22 +1744,47 @@ static int make_header_ex(int is_diff, uint8_t *pubkey, uint32_t pubkey_sz,
         const char *env_psize = getenv("WOLFBOOT_PARTITION_SIZE");
         const char *env_ssize = getenv("WOLFBOOT_SECTOR_SIZE");
         if (env_psize) {
-            uint32_t partition_sz = (uint32_t)strtol(env_psize, NULL, 0);
-            uint32_t sector_sz = env_ssize ?
-                (uint32_t)strtol(env_ssize, NULL, 0) : 0;
-            uint32_t total_img_sz = CMD.header_sz + image_sz;
-            /* Only subtract sector for trailer when sector < partition.
-             * When sector >= partition (e.g. update_ram targets), the
-             * entire partition is available for the image. */
-            uint32_t max_img_sz = (sector_sz < partition_sz) ?
-                (partition_sz - sector_sz) : partition_sz;
-            if (total_img_sz > max_img_sz) {
-                printf("Error: Image size %u (header %u + firmware %u) "
-                    "exceeds max %u (partition %u - sector %u)\n",
-                    total_img_sz, CMD.header_sz, image_sz,
-                    max_img_sz, partition_sz, sector_sz);
+            char *endptr;
+            unsigned long tmp;
+            uint32_t partition_sz, sector_sz = 0;
+
+            errno = 0;
+            tmp = strtoul(env_psize, &endptr, 0);
+            if (endptr == env_psize || *endptr != '\0' ||
+                    errno == ERANGE || tmp == 0 || tmp > UINT32_MAX) {
+                printf("Error: Invalid WOLFBOOT_PARTITION_SIZE '%s'\n",
+                    env_psize);
                 goto failure;
             }
+            partition_sz = (uint32_t)tmp;
+
+            if (env_ssize) {
+                errno = 0;
+                tmp = strtoul(env_ssize, &endptr, 0);
+                if (endptr == env_ssize || *endptr != '\0' ||
+                        errno == ERANGE || tmp == 0 || tmp > UINT32_MAX) {
+                    printf("Error: Invalid WOLFBOOT_SECTOR_SIZE '%s'\n",
+                        env_ssize);
+                    goto failure;
+                }
+                sector_sz = (uint32_t)tmp;
+            }
+
+            {
+                uint32_t total_img_sz = CMD.header_sz + image_sz;
+                /* Only subtract sector for trailer when sector < partition.
+                 * When sector >= partition (e.g. update_ram targets), the
+                 * entire partition is available for the image. */
+                uint32_t max_img_sz = (sector_sz < partition_sz) ?
+                    (partition_sz - sector_sz) : partition_sz;
+                if (total_img_sz > max_img_sz) {
+                    printf("Error: Image size %u (header %u + firmware %u) "
+                        "exceeds max %u (partition %u - sector %u)\n",
+                        total_img_sz, CMD.header_sz, image_sz,
+                        max_img_sz, partition_sz, sector_sz);
+                    goto failure;
+                }
+            }
         }
     }
 

tools/scripts/va416x0/build_test.sh

@@ -17,7 +17,7 @@ MODE=$1
 VERSION=$([ "$MODE" = "clean" ] && echo "${2:-1}" || echo "${2:-2}")
 
 # Find JLinkExe (in PATH on Linux, /Applications/SEGGER on macOS)
-if command -v JLinkExe &> /dev/null; then
+if command -v JLinkExe >/dev/null 2>&1; then
     JLINK="JLinkExe"
 else
     # Check for versioned JLink directory on macOS (e.g., JLink_V812g)