From 754d313f3f3224a00e1add0f3f65909a99db1cdc Mon Sep 17 00:00:00 2001
From: David Garske <david@wolfssl.com>
Date: Mon, 23 Jun 2025 11:15:10 -0700
Subject: [PATCH] Fixes for wolfssl submodule update. Also requires
 https://github.com/wolfSSL/wolfssl/pull/8913

---
 arch.mk       |  3 +--
 lib/wolfssl   |  2 +-
 tools/test.mk | 28 ++++++++++++++--------------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/arch.mk b/arch.mk
index 7c3680e0..d990942e 100644
--- a/arch.mk
+++ b/arch.mk
@@ -571,8 +571,7 @@ ifeq ($(ARCH),PPC)
     CFLAGS+=-DWOLFSSL_SP_PPC
     CFLAGS+=-DWOLFSSL_PPC32_ASM -DWOLFSSL_PPC32_ASM_INLINE
     #CFLAGS+=-DWOLFSSL_PPC32_ASM_SMALL
-    #CFLAGS+=-DUSE_SLOW_SHA256
-    OBJS+=./lib/wolfssl/wolfcrypt/src/port/ppc32/ppc32-sha256-asm_c.o
+    MATH_OBJS+=./lib/wolfssl/wolfcrypt/src/port/ppc32/ppc32-sha256-asm_c.o
   endif
 endif
 
diff --git a/lib/wolfssl b/lib/wolfssl
index b361c623..aec13923 160000
--- a/lib/wolfssl
+++ b/lib/wolfssl
@@ -1 +1 @@
-Subproject commit b361c62372744dfca5168f6233730cb5351745ef
+Subproject commit aec13923a7bdacf92e09e744ce40681c92395b67
diff --git a/tools/test.mk b/tools/test.mk
index 404182c9..8bc86c9e 100644
--- a/tools/test.mk
+++ b/tools/test.mk
@@ -961,40 +961,40 @@ test-all: clean
 
 
 test-size-all:
-	make test-size SIGN=NONE LIMIT=4860 NO_ARM_ASM=1
+	make test-size SIGN=NONE LIMIT=4824 NO_ARM_ASM=1
 	make keysclean
-	make test-size SIGN=ED25519 LIMIT=11448 NO_ARM_ASM=1
+	make test-size SIGN=ED25519 LIMIT=11428 NO_ARM_ASM=1
 	make keysclean
-	make test-size SIGN=ECC256  LIMIT=17988 NO_ARM_ASM=1
+	make test-size SIGN=ECC256  LIMIT=17968 NO_ARM_ASM=1
 	make clean
 	make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13536 NO_ARM_ASM=1
 	make keysclean
-	make test-size SIGN=RSA2048 LIMIT=11272 NO_ARM_ASM=1
+	make test-size SIGN=RSA2048 LIMIT=11264 NO_ARM_ASM=1
 	make clean
-	make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=11840 NO_ARM_ASM=1
+	make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=11844 NO_ARM_ASM=1
 	make keysclean
-	make test-size SIGN=RSA4096 LIMIT=11556 NO_ARM_ASM=1
+	make test-size SIGN=RSA4096 LIMIT=11552 NO_ARM_ASM=1
 	make clean
-	make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=12128 NO_ARM_ASM=1
+	make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=12132 NO_ARM_ASM=1
 	make keysclean
-	make test-size SIGN=ECC384 LIMIT=17556 NO_ARM_ASM=1
+	make test-size SIGN=ECC384 LIMIT=17464 NO_ARM_ASM=1
 	make clean
-	make test-size SIGN=ECC384 NO_ASM=1 LIMIT=14924 NO_ARM_ASM=1
+	make test-size SIGN=ECC384 NO_ASM=1 LIMIT=14912 NO_ARM_ASM=1
 	make keysclean
-	make test-size SIGN=ED448 LIMIT=13464 NO_ARM_ASM=1
+	make test-size SIGN=ED448 LIMIT=13416 NO_ARM_ASM=1
 	make keysclean
-	make test-size SIGN=RSA3072 LIMIT=11408 NO_ARM_ASM=1
+	make test-size SIGN=RSA3072 LIMIT=11404 NO_ARM_ASM=1
 	make clean
-	make test-size SIGN=RSA3072 NO_ASM=1 LIMIT=11944 NO_ARM_ASM=1
+	make test-size SIGN=RSA3072 NO_ASM=1 LIMIT=11948 NO_ARM_ASM=1
 	make keysclean
 	make test-size SIGN=LMS LMS_LEVELS=2 LMS_HEIGHT=5 LMS_WINTERNITZ=8 \
 		WOLFBOOT_SMALL_STACK=0 IMAGE_SIGNATURE_SIZE=2644 \
-		IMAGE_HEADER_SIZE?=5288 LIMIT=7536 NO_ARM_ASM=1
+		IMAGE_HEADER_SIZE?=5288 LIMIT=7516 NO_ARM_ASM=1
 	make keysclean
 	make test-size SIGN=XMSS XMSS_PARAMS='XMSS-SHA2_10_256' \
 		IMAGE_SIGNATURE_SIZE=2500 IMAGE_HEADER_SIZE?=4096 \
 		LIMIT=8292 NO_ARM_ASM=1
 	make keysclean
 	make clean
-	make test-size SIGN=ML_DSA ML_DSA_LEVEL=2 LIMIT=20168 \
+	make test-size SIGN=ML_DSA ML_DSA_LEVEL=2 LIMIT=18866 \
 		 IMAGE_SIGNATURE_SIZE=2420 IMAGE_HEADER_SIZE?=8192