Fix some compiler warnings and CI build test failures

Author: dgarske

arch.mk

@@ -589,10 +589,10 @@ ifeq ($(ARCH),RISCV64)
 
   ifneq ($(NO_ASM),1)
     CFLAGS+=-DWOLFSSL_RISCV_ASM
-    MATH_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv/riscv-64-sha256.o \
-               $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv/riscv-64-sha512.o \
-               $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv/riscv-64-sha3.o \
-               $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv/riscv-64-aes.o
+    WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv/riscv-64-sha256.o \
+                    $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv/riscv-64-sha512.o \
+                    $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv/riscv-64-sha3.o \
+                    $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv/riscv-64-aes.o
   endif
 endif
 

include/encrypt.h

@@ -24,7 +24,7 @@
 #ifndef ENCRYPT_H_INCLUDED
 #define ENCRYPT_H_INCLUDED
 
-#if defined(__WOLFBOOT) || defined(UNIT_TEST)
+#if defined(__WOLFBOOT) || defined(UNIT_TEST) || defined(MMU)
 
 #include <stdint.h>
 #include "wolfssl/wolfcrypt/settings.h"
@@ -89,5 +89,5 @@ int wolfBoot_enable_fallback_iv(int enable);
 void wolfBoot_crypto_set_iv(const uint8_t *nonce, uint32_t iv_counter);
 #endif
 
-#endif /* __WOLFBOOT || UNIT_TEST */
+#endif /* __WOLFBOOT || UNIT_TEST || MMU */
 #endif /* ENCRYPT_H_INCLUDED */

options.mk

@@ -409,7 +409,6 @@ ifeq ($(SIGN),ML_DSA)
   KEYGEN_OPTIONS+=--ml_dsa
   SIGN_OPTIONS+=--ml_dsa
   WOLFCRYPT_OBJS+= $(ML_DSA_OBJS)
-  WOLFCRYPT_OBJS+=$(MATH_OBJS)
   CFLAGS+=-D"WOLFBOOT_SIGN_ML_DSA" $(ML_DSA_EXTRA)
   ifneq ($(HASH),SHA3)
     WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/sha3.o

src/libwolfboot.c

@@ -116,9 +116,12 @@ int wolfBoot_initialize_encryption(void)
 #endif /* EXT_FLASH && EXT_ENCRYPTED */
 
 #if !defined(__WOLFBOOT) && !defined(UNIT_TEST)
-    #define XMEMSET memset
-    #define XMEMCPY memcpy
-    #define XMEMCMP memcmp
+    /* Avoid redefining if already defined by wolfSSL headers */
+    #if !defined(XMEMSET)
+        #define XMEMSET memset
+        #define XMEMCPY memcpy
+        #define XMEMCMP memcmp
+    #endif
 #endif
 
 #ifndef NULL