From cb2a80bf53220dd8b8f3c68b5c6fd061c8c2f7d0 Mon Sep 17 00:00:00 2001 From: Anthony Hu Date: Mon, 22 Dec 2025 17:05:47 -0500 Subject: [PATCH 1/3] Guard a bit of DTLS code. --- src/internal.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/internal.c b/src/internal.c index 111eb9ffde7..dcd76efe13c 100644 --- a/src/internal.c +++ b/src/internal.c @@ -1555,10 +1555,12 @@ static int ImportOptions(WOLFSSL* ssl, const byte* exp, word32 len, byte ver, idx++; #endif } - +#ifdef WOLFSSL_DTLS /* If we had a connection established, let's assume that we can act * statefully */ options->dtlsStateful = 1; +#endif + if (ver > WOLFSSL_EXPORT_VERSION_4) { #ifdef WOLFSSL_DTLS options->dtlsStateful = exp[idx++]; From c03c2dd541e95729929a7739e0c008902951cca9 Mon Sep 17 00:00:00 2001 From: Anthony Hu Date: Tue, 23 Dec 2025 11:48:57 -0500 Subject: [PATCH 2/3] Add tests --- .github/workflows/os-check.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/os-check.yml b/.github/workflows/os-check.yml index 33f5255a046..b92aadc31b6 100644 --- a/.github/workflows/os-check.yml +++ b/.github/workflows/os-check.yml @@ -66,6 +66,8 @@ jobs: '--disable-sni --disable-ecc --disable-tls13 --disable-secure-renegotiation-info', 'CPPFLAGS=-DWOLFSSL_BLIND_PRIVATE_KEY', '--enable-all --enable-certgencache', + '--enable-sessionexport --enable-dtls --enable-dtls13', + '--enable-sessionexport', ] name: make check if: github.repository_owner == 'wolfssl' From 40327b7fe355a2dc5857050d06bc0c0e4206f177 Mon Sep 17 00:00:00 2001 From: Anthony Hu Date: Tue, 23 Dec 2025 14:45:36 -0500 Subject: [PATCH 3/3] Binary consts to hexidecimal. C2X feature. --- tests/api.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/api.c b/tests/api.c index 1a3162b2456..ae0d7305c64 100644 --- a/tests/api.c +++ b/tests/api.c @@ -12043,7 +12043,7 @@ static int test_wolfSSL_dtls_export_peers(void) }; for (i = 0; i < sizeof(params)/sizeof(*params); i++) { - for (j = 0; j <= 0b11; j++) { + for (j = 0; j <= 3; j++) { XMEMSET(&client_cbf, 0, sizeof(client_cbf)); XMEMSET(&server_cbf, 0, sizeof(server_cbf)); @@ -12052,12 +12052,12 @@ static int test_wolfSSL_dtls_export_peers(void) client_cbf.method = params[i].client_meth; server_cbf.method = params[i].server_meth; - if (j & 0b01) { + if (j & 0x1) { client_cbf.on_handshake = test_wolfSSL_dtls_export_peers_on_handshake; printf(" With client export;"); } - if (j & 0b10) { + if (j & 0x2) { server_cbf.on_handshake = test_wolfSSL_dtls_export_peers_on_handshake; printf(" With server export;");