Peer review fixes

Author: dgarske

include/user_settings.h

@@ -92,6 +92,7 @@ extern int tolower(int c);
 #   define NO_ED448_EXPORT
 #   define WOLFSSL_SHA3
 #   define WOLFSSL_SHAKE256
+#   define WOLFSSL_SHA512
 #endif
 
 /* ECC */
@@ -498,11 +499,14 @@ extern int tolower(int c);
 
 
 #if !defined(ENCRYPT_WITH_AES128) && !defined(ENCRYPT_WITH_AES256) && \
-    !defined(WOLFBOOT_TPM_PARMENC) && !defined(WOLFCRYPT_SECURE_MODE)
+    !defined(WOLFBOOT_TPM_PARMENC) && !defined(WOLFCRYPT_SECURE_MODE) && \
+    !defined(SECURE_PKCS11) && !defined(WOLFCRYPT_TZ_PSA) && \
+    !defined(WOLFCRYPT_TEST) && !defined(WOLFCRYPT_BENCHMARK)
     #define NO_AES
 #endif
 
-#if !defined(WOLFBOOT_TPM) && !defined(WOLFCRYPT_SECURE_MODE)
+#if !defined(WOLFBOOT_TPM) && !defined(WOLFCRYPT_SECURE_MODE) && \
+    !defined(WOLFCRYPT_TEST) && !defined(WOLFCRYPT_BENCHMARK)
 #   define NO_HMAC
 #endif
 

test-app/Makefile

@@ -397,8 +397,12 @@ ifeq ($(TARGET),va416x0)
   ifneq ($(SIGN),NONE)
     APP_OBJS+=../src/keystore.o
   endif
-  # Reduce size: newlib-nano (small printf/snprintf, no float) and section GC
+  # Reduce size: newlib-nano and section GC
   LDFLAGS+=--specs=nano.specs --specs=nosys.specs
+  ifeq ($(WOLFCRYPT_BENCHMARK),1)
+    # Benchmark needs float printf for results
+    LDFLAGS+=-u _printf_float
+  endif
   CFLAGS+=-ffunction-sections -fdata-sections
 endif
 

test-app/wolfcrypt_support.c

@@ -39,6 +39,9 @@
 #if defined(WOLFCRYPT_SECURE_MODE)
     /* Use secure mode API for time */
     #include "wolfboot/wc_secure.h"
+#elif defined(TARGET_va416x0)
+    /* Use Vorago SDK HAL_time_ms (incremented by SysTick_Handler every 1ms) */
+    extern volatile uint64_t HAL_time_ms;
 #else
     /* Simple tick counter fallback */
     static volatile unsigned int tick_counter = 0;
@@ -54,10 +57,12 @@ unsigned long my_time(unsigned long* timer)
     unsigned long t = wolfBoot_nsc_get_time();
     if (timer) *timer = t;
     return t;
+#elif defined(TARGET_va416x0)
+    unsigned long t = (unsigned long)(HAL_time_ms / 1000);
+    if (timer) *timer = t;
+    return t;
 #else
     /* Simple incrementing counter */
-    /* WARNING: This is not real time! Only suitable for basic testing. */
-    /* For production use, implement actual RTC or define NO_ASN_TIME */
     tick_counter++;
     if (timer) *timer = tick_counter;
     return tick_counter;
@@ -75,10 +80,11 @@ double current_time(int reset)
 
 #if defined(WOLFCRYPT_SECURE_MODE)
     return wolfBoot_nsc_current_time(reset);
+#elif defined(TARGET_va416x0)
+    /* Use Vorago SDK SysTick-based millisecond counter */
+    return (double)HAL_time_ms / 1000.0;
 #else
     /* Simple counter-based timing */
-    /* WARNING: This will not give accurate benchmark results! */
-    /* For accurate benchmarks, implement hardware timer access */
     double timeNow = (double)tick_counter;
     return timeNow;
 #endif