From ca03fd9d856772a7415c9579b1e23cb2d865ef82 Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Mon, 21 Oct 2024 15:09:16 +0200 Subject: [PATCH 1/2] Updated wolfSSL to latest version --- lib/wolfssl | 2 +- src/xmalloc.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/wolfssl b/lib/wolfssl index 65742c4a7..ea3a79e21 160000 --- a/lib/wolfssl +++ b/lib/wolfssl @@ -1 +1 @@ -Subproject commit 65742c4a7a21d58c5a065ae80a1b02541b839e43 +Subproject commit ea3a79e216c6155b773edbdb3d9d361fcd53459d diff --git a/src/xmalloc.c b/src/xmalloc.c index 5abb9095f..b36f157a8 100644 --- a/src/xmalloc.c +++ b/src/xmalloc.c @@ -137,9 +137,9 @@ struct xmalloc_slot { #define MP_CURVE_SPECS_SIZE (MP_INT_TYPE_SIZE) #define MP_CURVE_FIELD_COUNT_SIZE (380) #ifndef _LP64 - #define ECC_POINT_SIZE (228) + #define ECC_POINT_SIZE (232) #else - #define ECC_POINT_SIZE (312) + #define ECC_POINT_SIZE (320) #define MP_INT_BUFFER_SIZE_1 (MP_INT_TYPE_SIZE * 5) #endif #define MP_INT_BUFFER_SIZE (MP_INT_TYPE_SIZE * 6) @@ -150,9 +150,9 @@ struct xmalloc_slot { #define MP_CURVE_SPECS_SIZE (MP_INT_TYPE_SIZE) #define MP_CURVE_FIELD_COUNT_SIZE (380) #ifndef _LP64 - #define ECC_POINT_SIZE (408) + #define ECC_POINT_SIZE (412) #else - #define ECC_POINT_SIZE (504) + #define ECC_POINT_SIZE (512) #endif #define MP_INT_BUFFER_SIZE (MP_INT_TYPE_SIZE * 5) #define MP_INT_BUFFER_SIZE_1 (MP_INT_TYPE_SIZE * 6) @@ -163,9 +163,9 @@ struct xmalloc_slot { #define MP_CURVE_SPECS_SIZE (MP_INT_TYPE_SIZE) #define MP_CURVE_FIELD_COUNT_SIZE (380) #ifndef _LP64 - #define ECC_POINT_SIZE (516) + #define ECC_POINT_SIZE (520) #else - #define ECC_POINT_SIZE (600) + #define ECC_POINT_SIZE (608) #endif #define MP_INT_BUFFER_SIZE (MP_INT_TYPE_SIZE * 5) #define MP_INT_BUFFER_SIZE_1 (MP_INT_TYPE_SIZE * 6) From 668f117c303ae06a596c9e54127f0603c4685312 Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Mon, 21 Oct 2024 15:15:15 +0200 Subject: [PATCH 2/2] LMS: adjusted footprint size --- tools/test.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/test.mk b/tools/test.mk index 464e71d40..167b9accc 100644 --- a/tools/test.mk +++ b/tools/test.mk @@ -1014,7 +1014,7 @@ test-size-all: 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=7424 + IMAGE_HEADER_SIZE?=5288 LIMIT=7504 make keysclean make test-size SIGN=XMSS XMSS_PARAMS='XMSS-SHA2_10_256' \ IMAGE_SIGNATURE_SIZE=2500 IMAGE_HEADER_SIZE?=4096 \