Skip to content

Commit b5cc117

Browse files
committed
Update wolfssl submodule to include PR 9689 and 9698
1 parent 86138b4 commit b5cc117

4 files changed

Lines changed: 14 additions & 9 deletions

File tree

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "lib/wolfssl"]
22
path = lib/wolfssl
3-
url = https://github.com/wolfSSL/wolfssl.git
3+
url = https://github.com/wolfssl/wolfssl.git
44
[submodule "lib/wolfTPM"]
55
path = lib/wolfTPM
66
url = https://github.com/wolfssl/wolfTPM

lib/wolfssl

Submodule wolfssl updated 78 files

src/xmalloc.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,7 @@ static uint8_t asncheck_buf[ASNCHECK_BUF_SIZE];
304304
#ifndef USE_FAST_MATH
305305
#ifdef WOLFBOOT_SIGN_RSA2048
306306
#define MP_SCHEME "SP RSA2048"
307+
#define RSA_KEY_BUF_SIZE (520)
307308
#ifdef WOLFSSL_SP_ARM_CORTEX_M_ASM
308309
#define MPDIGIT_BUF0_SIZE (MP_DIGIT_SIZE * 64 * 5)
309310
#else
@@ -313,6 +314,7 @@ static uint8_t asncheck_buf[ASNCHECK_BUF_SIZE];
313314
#endif
314315
#elif defined WOLFBOOT_SIGN_RSA3072
315316
#define MP_SCHEME "SP RSA3072"
317+
#define RSA_KEY_BUF_SIZE (520)
316318
#ifdef WOLFSSL_SP_ARM_CORTEX_M_ASM
317319
#define MPDIGIT_BUF0_SIZE (MP_DIGIT_SIZE * 96 * 5)
318320
#else
@@ -322,6 +324,7 @@ static uint8_t asncheck_buf[ASNCHECK_BUF_SIZE];
322324
#endif
323325
#else
324326
#define MP_SCHEME "SP RSA4096"
327+
#define RSA_KEY_BUF_SIZE (520)
325328
#ifdef WOLFSSL_SP_ARM_CORTEX_M_ASM
326329
#define MPDIGIT_BUF0_SIZE (MP_DIGIT_SIZE * 128 * 5)
327330
#else
@@ -330,12 +333,14 @@ static uint8_t asncheck_buf[ASNCHECK_BUF_SIZE];
330333
static uint8_t mp_digit_buf1[MPDIGIT_BUF1_SIZE];
331334
#endif
332335
#endif
336+
static uint8_t rsa_key_buf[RSA_KEY_BUF_SIZE];
333337
static uint8_t mp_digit_buf0[MPDIGIT_BUF0_SIZE];
334338
static struct xmalloc_slot xmalloc_pool[] = {
335339
#if defined(WOLFBOOT_HASH_SHA256) || defined(WOLFBOOT_HASH_SHA384)
336340
{ (uint8_t *)sha_block, HASH_BLOCK_SIZE * sizeof(uint32_t), 0 },
337341
#endif
338342
{ asncheck_buf, ASNCHECK_BUF_SIZE, 0 },
343+
{ rsa_key_buf, RSA_KEY_BUF_SIZE, 0 },
339344
{ mp_digit_buf0, MPDIGIT_BUF0_SIZE, 0},
340345
#ifndef WOLFSSL_SP_ARM_CORTEX_M_ASM
341346
{ mp_digit_buf1, MPDIGIT_BUF1_SIZE, 0},

tools/test.mk

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,23 +1021,23 @@ test-size-all:
10211021
make clean
10221022
make test-size SIGN=ECC256 NO_ASM=1 LIMIT=13840 NO_ARM_ASM=1
10231023
make keysclean
1024-
make test-size SIGN=RSA2048 LIMIT=11536 NO_ARM_ASM=1
1024+
make test-size SIGN=RSA2048 LIMIT=11916 NO_ARM_ASM=1
10251025
make clean
1026-
make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=12128 NO_ARM_ASM=1
1026+
make test-size SIGN=RSA2048 NO_ASM=1 LIMIT=12496 NO_ARM_ASM=1
10271027
make keysclean
1028-
make test-size SIGN=RSA4096 LIMIT=11824 NO_ARM_ASM=1
1028+
make test-size SIGN=RSA4096 LIMIT=12204 NO_ARM_ASM=1
10291029
make clean
1030-
make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=12400 NO_ARM_ASM=1
1030+
make test-size SIGN=RSA4096 NO_ASM=1 LIMIT=12784 NO_ARM_ASM=1
10311031
make keysclean
10321032
make test-size SIGN=ECC384 LIMIT=19888 NO_ARM_ASM=1
10331033
make clean
10341034
make test-size SIGN=ECC384 NO_ASM=1 LIMIT=15216 NO_ARM_ASM=1
10351035
make keysclean
10361036
make test-size SIGN=ED448 LIMIT=13760 NO_ARM_ASM=1
10371037
make keysclean
1038-
make test-size SIGN=RSA3072 LIMIT=11680 NO_ARM_ASM=1
1038+
make test-size SIGN=RSA3072 LIMIT=12056 NO_ARM_ASM=1
10391039
make clean
1040-
make test-size SIGN=RSA3072 NO_ASM=1 LIMIT=12224 NO_ARM_ASM=1
1040+
make test-size SIGN=RSA3072 NO_ASM=1 LIMIT=12600 NO_ARM_ASM=1
10411041
make keysclean
10421042
make test-size SIGN=LMS LMS_LEVELS=2 LMS_HEIGHT=5 LMS_WINTERNITZ=8 \
10431043
WOLFBOOT_SMALL_STACK=0 IMAGE_SIGNATURE_SIZE=2644 \
@@ -1048,5 +1048,5 @@ test-size-all:
10481048
LIMIT=8560 NO_ARM_ASM=1
10491049
make keysclean
10501050
make clean
1051-
make test-size SIGN=ML_DSA ML_DSA_LEVEL=2 LIMIT=19392 \
1051+
make test-size SIGN=ML_DSA ML_DSA_LEVEL=2 LIMIT=19354 \
10521052
IMAGE_SIGNATURE_SIZE=2420 IMAGE_HEADER_SIZE?=8192

0 commit comments

Comments
 (0)