Skip to content

Guard a bit of DTLS code. #9574

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

Merged
dgarske merged 3 commits into from
Dec 23, 2025
Merged

Guard a bit of DTLS code. #9574

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
cb2a80b
Guard a bit of DTLS code.
anhu Dec 22, 2025
c03c2dd
Add tests
anhu Dec 23, 2025
40327b7
Binary consts to hexidecimal. C2X feature.
anhu Dec 23, 2025
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
2 changes: 2 additions & 0 deletions .github/workflows/os-check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 3 additions & 1 deletion src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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++];
Expand Down
6 changes: 3 additions & 3 deletions tests/api.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));

Expand All @@ -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;");
Expand Down