wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3595 from julek-wolfssl/dtls-only-resend-on-timeout

Browse Source 
Only resend previous flight on a timeout from the network layer
This commit is contained in:
John Safranek
2021-01-19 10:43:13 -08:00
committed by GitHub
parent 209c4c08e1 0fe3efb8b4
commit eaa1bc1ace
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/internal.c
View File

@ -37,6 +37,11 @@
* Default wolfSSL behavior is to require validation of all presented peer * Default wolfSSL behavior is to require validation of all presented peer
* certificates. This also allows loading intermediate CA's as trusted * certificates. This also allows loading intermediate CA's as trusted
* and ignoring no signer failures for CA's up the chain to root. * and ignoring no signer failures for CA's up the chain to root.
* WOLFSSL_DTLS_RESEND_ONLY_TIMEOUT:
* Enable resending the previous DTLS handshake flight only on a network
* read timeout. By default we resend in two more cases, when we receive:
* - an out of order last msg of the peer's flight
* - a duplicate of the first msg from the peer's flight
*/ */
@ -13433,10 +13438,12 @@ static int DoDtlsHandShakeMsg(WOLFSSL* ssl, byte* input, word32* inOutIdx,
} }
*inOutIdx += ssl->keys.padSz; *inOutIdx += ssl->keys.padSz;
ret = 0; ret = 0;
#ifndef WOLFSSL_DTLS_RESEND_ONLY_TIMEOUT
/* If we receive an out of order last flight msg then retransmit */ /* If we receive an out of order last flight msg then retransmit */
if (type == server_hello_done || type == finished) { if (type == server_hello_done || type == finished) {
ret = DtlsMsgPoolSend(ssl, 0); ret = DtlsMsgPoolSend(ssl, 0);
} }
#endif
} }
else { else {
ret = DoHandShakeMsgType(ssl, input, inOutIdx, type, size, totalSz); ret = DoHandShakeMsgType(ssl, input, inOutIdx, type, size, totalSz);
@ -13472,11 +13479,13 @@ static int DoDtlsHandShakeMsg(WOLFSSL* ssl, byte* input, word32* inOutIdx,
return BUFFER_E; return BUFFER_E;
} }
} }
#ifndef WOLFSSL_DTLS_RESEND_ONLY_TIMEOUT
if (IsDtlsNotSctpMode(ssl) && if (IsDtlsNotSctpMode(ssl) &&
VerifyForDtlsMsgPoolSend(ssl, type, fragOffset)) { VerifyForDtlsMsgPoolSend(ssl, type, fragOffset)) {
ret = DtlsMsgPoolSend(ssl, 0); ret = DtlsMsgPoolSend(ssl, 0);
} }
#endif
*inOutIdx += ssl->keys.padSz; *inOutIdx += ssl->keys.padSz;
} }
else if (fragSz < size) { else if (fragSz < size) {