feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #5487 from icing/tls13_early_nr

Browse Source 
Improved EarlyData Indicator reply fix based on PR #5486
This commit is contained in:
David Garske
2022-08-19 09:54:17 -07:00
committed by GitHub
parent 1d0e83bd1a 7a5170b6e1
commit f3b9cfa71c
4 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/tls.c
View File

@ -10324,7 +10324,7 @@ static int TLSX_EarlyData_Parse(WOLFSSL* ssl, const byte* input, word16 length,
else else
ssl->earlyDataStatus = WOLFSSL_EARLY_DATA_REJECTED; ssl->earlyDataStatus = WOLFSSL_EARLY_DATA_REJECTED;
return TLSX_EarlyData_Use(ssl, 0); return TLSX_EarlyData_Use(ssl, 0, 0);
} }
ssl->earlyData = early_data_ext; ssl->earlyData = early_data_ext;
@ -10347,7 +10347,7 @@ static int TLSX_EarlyData_Parse(WOLFSSL* ssl, const byte* input, word16 length,
ssl->earlyDataStatus = WOLFSSL_EARLY_DATA_ACCEPTED; ssl->earlyDataStatus = WOLFSSL_EARLY_DATA_ACCEPTED;
} }
return TLSX_EarlyData_Use(ssl, 1); return TLSX_EarlyData_Use(ssl, 1, 1);
} }
if (msgType == session_ticket) { if (msgType == session_ticket) {
word32 maxSz; word32 maxSz;
@ -10368,9 +10368,10 @@ static int TLSX_EarlyData_Parse(WOLFSSL* ssl, const byte* input, word16 length,
* *
* ssl The SSL/TLS object. * ssl The SSL/TLS object.
* maxSz The maximum early data size. * maxSz The maximum early data size.
* is_response if this extension is part of a response
* returns 0 on success and other values indicate failure. * returns 0 on success and other values indicate failure.
*/ */
int TLSX_EarlyData_Use(WOLFSSL* ssl, word32 maxSz) int TLSX_EarlyData_Use(WOLFSSL* ssl, word32 maxSz, int is_response)
{ {
int ret = 0; int ret = 0;
TLSX* extension; TLSX* extension;
@ -10388,7 +10389,7 @@ int TLSX_EarlyData_Use(WOLFSSL* ssl, word32 maxSz)
return MEMORY_E; return MEMORY_E;
} }
extension->resp = 1; extension->resp = is_response;
extension->val = maxSz; extension->val = maxSz;
return 0; return 0;

4
src/tls13.c
View File

@ -3523,7 +3523,7 @@ int SendTls13ClientHello(WOLFSSL* ssl)
if (ssl->earlyData == no_early_data) if (ssl->earlyData == no_early_data)
TLSX_Remove(&ssl->extensions, TLSX_EARLY_DATA, ssl->heap); TLSX_Remove(&ssl->extensions, TLSX_EARLY_DATA, ssl->heap);
if (ssl->earlyData != no_early_data && if (ssl->earlyData != no_early_data &&
(ret = TLSX_EarlyData_Use(ssl, 0)) < 0) { (ret = TLSX_EarlyData_Use(ssl, 0, 0)) < 0) {
return ret; return ret;
} }
#endif #endif
@ -9097,7 +9097,7 @@ static int SendTls13NewSessionTicket(WOLFSSL* ssl)
#ifdef WOLFSSL_EARLY_DATA #ifdef WOLFSSL_EARLY_DATA
ssl->session->maxEarlyDataSz = ssl->options.maxEarlyDataSz; ssl->session->maxEarlyDataSz = ssl->options.maxEarlyDataSz;
if (ssl->session->maxEarlyDataSz > 0) if (ssl->session->maxEarlyDataSz > 0)
TLSX_EarlyData_Use(ssl, ssl->session->maxEarlyDataSz); TLSX_EarlyData_Use(ssl, ssl->session->maxEarlyDataSz, 1);
extSz = 0; extSz = 0;
ret = TLSX_GetResponseSize(ssl, session_ticket, &extSz); ret = TLSX_GetResponseSize(ssl, session_ticket, &extSz);
if (ret != 0) if (ret != 0)

2
tests/quic.c
View File

@ -1381,7 +1381,7 @@ int QuicTest(void)
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
if ((ret = test_quic_resumption(verbose)) != 0) goto leave; if ((ret = test_quic_resumption(verbose)) != 0) goto leave;
#ifdef WOLFSSL_EARLY_DATA #ifdef WOLFSSL_EARLY_DATA
if ((ret = test_quic_early_data(verbose)) != 0) goto leave; if ((ret = test_quic_early_data(verbose || 1)) != 0) goto leave;
#endif /* WOLFSSL_EARLY_DATA */ #endif /* WOLFSSL_EARLY_DATA */
if ((ret = test_quic_session_export(verbose)) != 0) goto leave; if ((ret = test_quic_session_export(verbose)) != 0) goto leave;
#endif /* HAVE_SESSION_TICKET */ #endif /* HAVE_SESSION_TICKET */

2
wolfssl/internal.h
View File

@ -2827,7 +2827,7 @@ enum PskKeyExchangeMode {
WOLFSSL_LOCAL int TLSX_PskKeModes_Use(WOLFSSL* ssl, byte modes); WOLFSSL_LOCAL int TLSX_PskKeModes_Use(WOLFSSL* ssl, byte modes);
#ifdef WOLFSSL_EARLY_DATA #ifdef WOLFSSL_EARLY_DATA
WOLFSSL_LOCAL int TLSX_EarlyData_Use(WOLFSSL* ssl, word32 max); WOLFSSL_LOCAL int TLSX_EarlyData_Use(WOLFSSL* ssl, word32 max, int is_response);
#endif #endif
#endif /* HAVE_SESSION_TICKET || !NO_PSK */ #endif /* HAVE_SESSION_TICKET || !NO_PSK */