diff --git a/arch.mk b/arch.mk
index 42a08fc19f..f4b17e15a4 100644
--- a/arch.mk
+++ b/arch.mk
@@ -963,11 +963,13 @@ ifeq ($(ARCH),RISCV64)
   endif
 
   ifneq ($(NO_ASM),1)
-    CFLAGS+=-DWOLFSSL_RISCV_ASM
-    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
+    CFLAGS+=-DWOLFSSL_RISCV_ASM -DWOLFSSL_RISCV_ASM_INLINE
+    WOLFCRYPT_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv64/riscv-64-sha256-asm_c.o \
+                    $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv64/riscv-64-sha512-asm_c.o \
+                    $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv64/riscv-64-sha3-asm_c.o \
+                    $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv64/riscv-64-aes-asm_c.o
+    # generated file has unused tables when AES decrypt/GCM are disabled
+    $(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/riscv64/riscv-64-aes-asm_c.o: CFLAGS+=-Wno-unused-const-variable
   endif
 endif
 
@@ -1007,11 +1009,13 @@ ifeq ($(ARCH),PPC)
   endif
 
   ifneq ($(NO_ASM),1)
-    # Use the SHA256 and SP math all assembly accelerations
+    # Use the SHA-2 and SP math all assembly accelerations
     CFLAGS+=-DWOLFSSL_SP_PPC
     CFLAGS+=-DWOLFSSL_PPC32_ASM -DWOLFSSL_PPC32_ASM_INLINE
     #CFLAGS+=-DWOLFSSL_PPC32_ASM_SMALL
     MATH_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/ppc32/ppc32-sha256-asm_c.o
+    # builds empty unless SHA-384/512 is enabled
+    MATH_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/ppc32/ppc32-sha512-asm_c.o
   endif
 endif
 
diff --git a/lib/wolfHSM b/lib/wolfHSM
index 7c6359e7f8..84f86a3e9f 160000
--- a/lib/wolfHSM
+++ b/lib/wolfHSM
@@ -1 +1 @@
-Subproject commit 7c6359e7f82670727dd783304f7cdfe1b964feb2
+Subproject commit 84f86a3e9f7d363efbaeb78318f0ab1179f2ba81
diff --git a/lib/wolfssl b/lib/wolfssl
index ac01707f55..e882e1dc74 160000
--- a/lib/wolfssl
+++ b/lib/wolfssl
@@ -1 +1 @@
-Subproject commit ac01707f552c611fbd135cc723b2682b3e7f80f2
+Subproject commit e882e1dc7434b25cc9bbe8adb57d99db46b50c53
diff --git a/test-app/Makefile b/test-app/Makefile
index 2369dbfaad..71224d5742 100644
--- a/test-app/Makefile
+++ b/test-app/Makefile
@@ -228,8 +228,10 @@ ifeq ($(WOLFCRYPT_SUPPORT),1)
         CFLAGS+=-DWOLFSSL_SP_PPC
       endif
 
-      # SHA256
+      # SHA-2
       APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/ppc32/ppc32-sha256-asm_c.o
+      # builds empty unless SHA-384/512 is enabled
+      APP_OBJS+=$(WOLFBOOT_LIB_WOLFSSL)/wolfcrypt/src/port/ppc32/ppc32-sha512-asm_c.o
       CFLAGS+=-DWOLFSSL_PPC32_ASM
       CFLAGS+=-DWOLFSSL_PPC32_ASM_INLINE
       CFLAGS+=-DWOLFSSL_PPC32_ASM_SMALL
diff --git a/tools/test.mk b/tools/test.mk
index ba08e6a161..6099d6a38d 100644
--- a/tools/test.mk
+++ b/tools/test.mk
@@ -1191,7 +1191,7 @@ test-size-all:
 	make keysclean
 	make test-size SIGN=ECC256  LIMIT=18880 NO_ARM_ASM=1
 	make clean
-	make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13896 NO_ARM_ASM=1
+	make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13924 NO_ARM_ASM=1
 	make keysclean
 	make test-size SIGN=RSA2048 LIMIT=11768 NO_ARM_ASM=1
 	make clean
@@ -1203,9 +1203,9 @@ test-size-all:
 	make keysclean
 	make test-size SIGN=ECC384 LIMIT=19564 NO_ARM_ASM=1
 	make clean
-	make test-size SIGN=ECC384 NO_ASM=1 LIMIT=15260 NO_ARM_ASM=1
+	make test-size SIGN=ECC384 NO_ASM=1 LIMIT=15284 NO_ARM_ASM=1
 	make keysclean
-	make test-size SIGN=ED448 LIMIT=14212 NO_ARM_ASM=1
+	make test-size SIGN=ED448 LIMIT=14248 NO_ARM_ASM=1
 	make keysclean
 	make test-size SIGN=RSA3072 LIMIT=11908 NO_ARM_ASM=1
 	make clean
@@ -1232,5 +1232,5 @@ test-size-all:
 		LIMIT=8728 NO_ARM_ASM=1
 	make keysclean
 	make clean
-	make test-size SIGN=ML_DSA ML_DSA_LEVEL=2 LIMIT=19486 \
+	make test-size SIGN=ML_DSA ML_DSA_LEVEL=2 LIMIT=19582 \
 		IMAGE_SIGNATURE_SIZE=2420 IMAGE_HEADER_SIZE?=8192