Skip to content

Fixes for static memory builds with WOLFSSL_NO_MALLOC #11432

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Frauschi wants to merge 3 commits into
base: master
Choose a base branch
from
+59 −11
Open

Fixes for static memory builds with WOLFSSL_NO_MALLOC #11432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2a00cb6
Copy the RSA public key onto the CA Signer in static-memory builds
Frauschi Sep 14, 2026
edd5b59
Size the wolfCrypt test pool for no-malloc OPENSSL_EXTRA builds
Frauschi Sep 14, 2026
cc50474
Set the global heap hint in the static memory examples
Frauschi Sep 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions examples/client/client.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3465,6 +3465,12 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
err_sys("unable to load static memory");
}

#if defined(WOLFSSL_NO_MALLOC) && !defined(NO_MAIN_DRIVER)
/* only the standalone program may publish a pool of its own */
if (wolfSSL_GetGlobalHeapHint() == NULL)
wolfSSL_SetGlobalHeapHint(heap);
#endif

#if defined(WOLFSSL_STATIC_MEMORY) && \
defined(WOLFSSL_STATIC_MEMORY_DEBUG_CALLBACK)
wolfSSL_SetDebugMemoryCb(ExampleDebugMemoryCb);
Expand Down Expand Up @@ -5156,6 +5162,13 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
(void) useVerifyCb;
(void) customVerifyCert;

#if defined(WOLFSSL_STATIC_MEMORY) && defined(WOLFSSL_NO_MALLOC) && \
!defined(NO_MAIN_DRIVER)
/* the pool backing the hint is on this function's stack */
if (wolfSSL_GetGlobalHeapHint() == (void*)heap)
wolfSSL_SetGlobalHeapHint(NULL);
#endif

WOLFSSL_RETURN_FROM_THREAD(0);
}

Expand Down
24 changes: 21 additions & 3 deletions examples/server/server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1835,6 +1835,7 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
WOLFSSL_MEM_STATS mem_stats;
#endif
#endif
WOLFSSL_HEAP_HINT *heap = NULL;
#endif
#if defined(WOLFSSL_TLS13) && defined(HAVE_SUPPORTED_CURVES)
int onlyKeyShare = 0;
Expand Down Expand Up @@ -2826,9 +2827,19 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
WOLFMEM_IO_POOL_FIXED));
#endif /* DEBUG_WOLFSSL */

if (wolfSSL_CTX_load_static_memory(&ctx, method, memory, sizeof(memory),0,1)
!= WOLFSSL_SUCCESS)
err_sys_ex(catastrophic, "unable to load static memory and create ctx");
if (wc_LoadStaticMemory(&heap, memory, sizeof(memory), 0, 1) != 0)
err_sys_ex(catastrophic, "unable to load static memory");

#if defined(WOLFSSL_NO_MALLOC) && !defined(NO_MAIN_DRIVER)
/* only the standalone program may publish a pool of its own */
if (wolfSSL_GetGlobalHeapHint() == NULL)
wolfSSL_SetGlobalHeapHint(heap);
#endif

if (method != NULL)
ctx = wolfSSL_CTX_new_ex(method(heap), heap);
if (ctx == NULL)
err_sys_ex(catastrophic, "unable to get ctx");

/* load in a buffer for IO */
if (wolfSSL_CTX_load_static_memory(&ctx, NULL, memoryIO, sizeof(memoryIO),
Expand Down Expand Up @@ -4249,6 +4260,13 @@ THREAD_RETURN WOLFSSL_THREAD server_test(void* args)
#if defined(WOLFSSL_CALLBACKS) && defined(WOLFSSL_EARLY_DATA)
(void) earlyData;
#endif
#if defined(WOLFSSL_STATIC_MEMORY) && defined(WOLFSSL_NO_MALLOC) && \
!defined(NO_MAIN_DRIVER)
/* the pool backing the hint is on this function's stack */
if (wolfSSL_GetGlobalHeapHint() == (void*)heap)
wolfSSL_SetGlobalHeapHint(NULL);
#endif

WOLFSSL_RETURN_FROM_THREAD(0);
}

Expand Down
4 changes: 2 additions & 2 deletions tests/unit-mcdc/test_asn_ext_whitebox.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2737,7 +2737,7 @@ static void wb_decode_cert_req_version(void) { WB_NOTE("WOLFSSL_CERT_REQ off; sk
* Section 26: ParseCert() RSA public key store [:23263-:23267]
* (best-effort -- see file-header RESIDUAL note for operands 2/3).
* ------------------------------------------------------------------------- */
#if (!defined(WOLFSSL_NO_MALLOC) && !defined(NO_WOLFSSL_CM_VERIFY)) || \
#if (!defined(WC_ASN_NO_HEAP) && !defined(NO_WOLFSSL_CM_VERIFY)) || \
defined(WOLFSSL_DYN_CERT)
static void wb_parse_cert_rsa_pubkey(void)
{
Expand All @@ -2761,7 +2761,7 @@ static void wb_parse_cert_rsa_pubkey(void)
FreeDecodedCert(&cert);
}
#else
static void wb_parse_cert_rsa_pubkey(void) { WB_NOTE("WOLFSSL_NO_MALLOC build; ParseCert copy-out skipped"); }
static void wb_parse_cert_rsa_pubkey(void) { WB_NOTE("WC_ASN_NO_HEAP build; ParseCert copy-out skipped"); }
#endif

/* ------------------------------------------------------------------------- *
Expand Down
13 changes: 8 additions & 5 deletions wolfcrypt/src/asn.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24080,7 +24080,7 @@ static int DecodeCertReq(DecodedCert* cert, int* criticalExt)
int ParseCert(DecodedCert* cert, int type, int verify, void* cm)
{
int ret;
#if (!defined(WOLFSSL_NO_MALLOC) && !defined(NO_WOLFSSL_CM_VERIFY)) || \
#if (!defined(WC_ASN_NO_HEAP) && !defined(NO_WOLFSSL_CM_VERIFY)) || \
defined(WOLFSSL_DYN_CERT)
char* ptr;
#endif
Expand All @@ -24089,9 +24089,9 @@ int ParseCert(DecodedCert* cert, int type, int verify, void* cm)
if (ret < 0)
return ret;

#if (!defined(WOLFSSL_NO_MALLOC) && !defined(NO_WOLFSSL_CM_VERIFY)) || \
#if (!defined(WC_ASN_NO_HEAP) && !defined(NO_WOLFSSL_CM_VERIFY)) || \
defined(WOLFSSL_DYN_CERT)
/* cert->subjectCN not stored as copy of WOLFSSL_NO_MALLOC defined */
/* cert->subjectCN not stored as a copy when there is no allocator */
if (cert->subjectCNLen > 0) {
ptr = (char*)XMALLOC((size_t)cert->subjectCNLen + 1, cert->heap,
DYNAMIC_TYPE_SUBJECT_CN);
Expand All @@ -24104,9 +24104,12 @@ int ParseCert(DecodedCert* cert, int type, int verify, void* cm)
}
#endif

#if (!defined(WOLFSSL_NO_MALLOC) && !defined(NO_WOLFSSL_CM_VERIFY)) || \
/* WC_ASN_NO_HEAP, not WOLFSSL_NO_MALLOC: a static-memory build defines the
* latter but still has an allocator, and StoreKey() copies the non-RSA keys
* on the same condition. Skipping the copy here leaves Signer.publicKey NULL,
* so every chain verify under an RSA CA fails BAD_FUNC_ARG. */
#if (!defined(WC_ASN_NO_HEAP) && !defined(NO_WOLFSSL_CM_VERIFY)) || \
defined(WOLFSSL_DYN_CERT)
/* cert->publicKey not stored as copy if WOLFSSL_NO_MALLOC defined */
if ((cert->keyOID == RSAk
#ifdef WC_RSA_PSS
|| cert->keyOID == RSAPSSk
Expand Down
16 changes: 15 additions & 1 deletion wolfcrypt/test/test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1529,6 +1529,11 @@ static WC_MAYBE_UNUSED Aes* test_AesGcmNew(void* heap, int declaredDevId,
#else
static byte gTestMemory[576*1024]; /* ML-DSA full mem */
#endif
#elif defined(WOLFSSL_NO_MALLOC) && defined(OPENSSL_EXTRA) && \

@wolfSSL-Fenrir-bot wolfSSL-Fenrir-bot Sep 14, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ML-DSA builds bypass the enlarged static test pool · Logic errors

WOLFSSL_HAVE_MLDSA is tested before the new no-malloc/OpenSSL arm, so that supported combination still receives only 192 or 576 KiB. This preserves the static-pool exhaustion the new 1 MiB arm addresses.

Suggested fix: Select the 1 MiB pool before the ML-DSA arm whenever WOLFSSL_NO_MALLOC && OPENSSL_EXTRA && !BENCH_EMBEDDED holds.

!defined(BENCH_EMBEDDED)
/* No malloc, so the compatibility layer's NULL-heap allocations come
* out of this pool as well, not the system heap. */
static byte gTestMemory[1024*1024];
#elif defined(BENCH_EMBEDDED)
static byte gTestMemory[14000];
#elif defined(WOLFSSL_CERT_EXT)
Expand Down Expand Up @@ -2354,7 +2359,7 @@ options: [-s max_relative_stack_bytes] [-m max_relative_heap_memory_bytes]\n\
printf("unable to load static memory.\n");
EXIT_TEST(EXIT_FAILURE);
}
#ifndef OPENSSL_EXTRA
#if !defined(OPENSSL_EXTRA) || defined(WOLFSSL_NO_MALLOC)
wolfSSL_SetGlobalHeapHint(HEAP_HINT);

@wolfSSL-Fenrir-bot wolfSSL-Fenrir-bot Sep 14, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Test permanently clobbers a caller's global heap hint · Race conditions in setup/teardown

The new branch overwrites any caller-installed global heap hint and OPENSSL_EXTRA skips teardown, so later NULL-hint allocations use the test pool. Adjacent #3994 covers setter synchronization, not this call-site lifetime clobber.

Suggested fix: Install HEAP_HINT only when the global hint is NULL, preserving any caller-owned hint.

#endif
#endif
Expand Down Expand Up @@ -29695,6 +29700,15 @@ static wc_test_ret_t cert_no_malloc_test(void)
ret = WC_TEST_RET_ENC_NC;
}
}
#else
/* With an allocator the RSA key is copied out, so a Signer built from this
* cert keeps a public key of its own. */
if ((ret == 0) && ((cert.pubKeyStored != 1) ||

@wolfSSL-Fenrir-bot wolfSSL-Fenrir-bot Sep 14, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RSA copy-out assertion rejects no-CM-verify builds · Logic errors

cert_no_malloc_test() requires pubKeyStored == 1 in every non-WC_ASN_NO_HEAP build, while ParseCert() skips copy-out under NO_WOLFSSL_CM_VERIFY without WOLFSSL_DYN_CERT. Those builds fail the test despite correct parser behavior.

Suggested fix: Gate the copy-out assertion with the same NO_WOLFSSL_CM_VERIFY and WOLFSSL_DYN_CERT predicate used by ParseCert().
Basis: The project documents NO_WOLFSSL_CM_VERIFY as disabling certificate-manager verification and uses that predicate to control RSA copy-out.

(((wc_ptr_t)cert.publicKey >= (wc_ptr_t)cert.source) &&
((wc_ptr_t)cert.publicKey <
(wc_ptr_t)cert.source + cert.maxIdx)))) {
ret = WC_TEST_RET_ENC_NC;
}
#endif
FreeDecodedCert(&cert);
#endif
Expand Down
Loading