Skip to content

Commit 54022b1

Browse files
authored
Merge pull request #7456 from mrdeep1/enable-dtls13
dtls1.3: Fix issues when --enable-dtls13 enabled
2 parents 7881f4e + e36df36 commit 54022b1

3 files changed

Lines changed: 7 additions & 2 deletions

File tree

scripts/dtlscid.test

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22

3-
set -e
3+
# dtlscid.test
4+
# Copyright wolfSSL 2022-2024
45

56
# if we can, isolate the network namespace to eliminate port collisions.
67
if [[ -n "$NETWORK_UNSHARE_HELPER" ]]; then

src/tls.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6120,8 +6120,12 @@ static int TLSX_SupportedVersions_Write(void* data, byte* output,
61206120
#ifdef WOLFSSL_DTLS13
61216121
if (ssl->options.dtls) {
61226122
tls13minor = (byte)DTLSv1_3_MINOR;
6123+
#ifndef WOLFSSL_NO_TLS12
61236124
tls12minor = (byte)DTLSv1_2_MINOR;
6125+
#endif
6126+
#ifndef NO_OLD_TLS
61246127
tls11minor = (byte)DTLS_MINOR;
6128+
#endif
61256129
isDtls = 1;
61266130
}
61276131
#endif /* WOLFSSL_DTLS13 */

src/tls13.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4443,7 +4443,7 @@ int SendTls13ClientHello(WOLFSSL* ssl)
44434443

44444444
{
44454445
#ifdef WOLFSSL_DTLS_CH_FRAG
4446-
int maxFrag = wolfSSL_GetMaxFragSize(ssl, MAX_RECORD_SIZE);
4446+
word16 maxFrag = wolfSSL_GetMaxFragSize(ssl, MAX_RECORD_SIZE);
44474447
word16 lenWithoutExts = args->length;
44484448
#endif
44494449

0 commit comments

Comments
 (0)