Merge pull request #201 from danielinux/wolfboot-1.11-submodules

Updated submodules to wolfSSL 5.3.0
wolfSSL · May 4, 2022 · ba5e15a · ba5e15a
2 parents 5762714 + 5002e83
commit ba5e15a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 19 deletions.
diff --git a/lib/wolfTPM b/lib/wolfTPM
diff --git a/lib/wolfssl b/lib/wolfssl
diff --git a/options.mk b/options.mk
@@ -43,7 +43,7 @@ ifeq ($(SIGN),ECC256)
   else ifneq ($(SPMATH),1)
     STACK_USAGE=5008
   else
-    STACK_USAGE=3896
+    STACK_USAGE=3952
   endif
   PUBLIC_KEY_OBJS=./src/ecc256_pub_key.o
   ifeq ($(shell test $(IMAGE_HEADER_SIZE) -lt 256; echo $$?),0)

diff --git a/src/xmalloc.c b/src/xmalloc.c
@@ -65,26 +65,26 @@ struct xmalloc_slot {
         #define MP_CURVE_SPECS_SIZE (80)
         #ifdef WOLFSSL_SP_ARM_CORTEX_M_ASM
             #define MP_POINT_SIZE (196)
-            #define MP_DIGITS_BUFFER_SIZE_0 (MP_DIGIT_SIZE * 16 * 8)
-            #define MP_DIGITS_BUFFER_SIZE_1 (MP_DIGIT_SIZE * 2 * 8 * 5)
+            #define MP_DIGITS_BUFFER_SIZE_0 (MP_DIGIT_SIZE * 18 * 8)
+            #define MP_DIGITS_BUFFER_SIZE_1 (MP_DIGIT_SIZE * 2 * 8 * 6)
         #else
             #define MP_POINT_SIZE (220)
-            #define MP_DIGITS_BUFFER_SIZE_0 (MP_DIGIT_SIZE * 16 * 9)
+            #define MP_DIGITS_BUFFER_SIZE_0 (MP_DIGIT_SIZE * 18 * 9)
             #define MP_DIGITS_BUFFER_SIZE_1 (MP_DIGIT_SIZE * (4 * 9 + 3))
-            #define MP_DIGITS_BUFFER_SIZE_2 (MP_DIGIT_SIZE * (2 * 9 * 5))
+            #define MP_DIGITS_BUFFER_SIZE_2 (MP_DIGIT_SIZE * (2 * 9 * 6))
             #define MP_MONTGOMERY_SIZE (sizeof(int64_t) * 2 * 8)
         #endif
     #endif /* WOLFBOOT_SIGN_ECC256 */
     #ifdef WOLFBOOT_SIGN_ECC384
         #define MP_CURVE_SPECS_SIZE (112)
         #ifdef WOLFSSL_SP_ARM_CORTEX_M_ASM
             #define MP_POINT_SIZE (292)
-            #define MP_DIGITS_BUFFER_SIZE_0 (MP_DIGIT_SIZE * 16 * 12)
+            #define MP_DIGITS_BUFFER_SIZE_0 (MP_DIGIT_SIZE * 18 * 12)
             #define MP_DIGITS_BUFFER_SIZE_1 (MP_DIGIT_SIZE * 2 * 12 * 6)
             #define MP_MONTGOMERY_SIZE (sizeof(int64_t) * 12)
         #else
             #define MP_POINT_SIZE (364)
-            #define MP_DIGITS_BUFFER_SIZE_0 (MP_DIGIT_SIZE * 16 * 15)
+            #define MP_DIGITS_BUFFER_SIZE_0 (MP_DIGIT_SIZE * 18 * 15)
             #define MP_DIGITS_BUFFER_SIZE_1 (MP_DIGIT_SIZE * (4 * 15 + 3))
             #define MP_DIGITS_BUFFER_SIZE_2 (MP_DIGIT_SIZE * (2 * 15 * 6))
             #define MP_MONTGOMERY_SIZE (sizeof(int64_t) * 2 * 12)

diff --git a/tools/test.mk b/tools/test.mk
@@ -768,13 +768,13 @@ test-all: clean
 
 test-size-all:
 	make test-size SIGN=NONE LIMIT=4610
-	make test-size SIGN=ED25519 LIMIT=10670
-	make test-size SIGN=ECC256  LIMIT=21538
-	make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13042
-	make test-size SIGN=RSA2048 LIMIT=10538
-	make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=11626
-	make test-size SIGN=RSA4096 LIMIT=10894
-	make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=11910
-	make test-size SIGN=ECC384 LIMIT=16866
-	make test-size SIGN=ECC384 NO_ASM=1 LIMIT=14294
-	make test-size SIGN=ED448 LIMIT=12830
+	make test-size SIGN=ED25519 LIMIT=10734
+	make test-size SIGN=ECC256  LIMIT=21758
+	make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13266
+	make test-size SIGN=RSA2048 LIMIT=10722
+	make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=11702
+	make test-size SIGN=RSA4096 LIMIT=11074
+	make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=11974
+	make test-size SIGN=ECC384 LIMIT=17078
+	make test-size SIGN=ECC384 NO_ASM=1 LIMIT=14698
+	make test-size SIGN=ED448 LIMIT=12902