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

Fix for async handling of TLS v1.3 hello retry broken in #4863.

Browse Source
This commit is contained in:
David Garske
2022-02-21 13:26:18 -08:00
parent e6c07a296d
commit 31abc99f6f
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/tls13.c
View File

@ -3315,7 +3315,7 @@ int DoTls13ServerHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
if (ret < 0) { if (ret < 0) {
if (ret == WC_PENDING_E) { if (ret == WC_PENDING_E) {
/* Mark message as not received so it can process again */ /* Mark message as not received so it can process again */
ssl->msgsReceived.got_server_hello--; ssl->msgsReceived.got_server_hello = 0;
} }
return ret; return ret;
} }
@ -3380,10 +3380,6 @@ int DoTls13ServerHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
if (ssl->msgsReceived.got_hello_retry_request) { if (ssl->msgsReceived.got_hello_retry_request) {
return DUPLICATE_MSG_E; return DUPLICATE_MSG_E;
} }
/* Update counts to reflect change of message type. */
ssl->msgsReceived.got_hello_retry_request = 1;
ssl->msgsReceived.got_server_hello--;
} }
args->extMsgType = *extMsgType; args->extMsgType = *extMsgType;
@ -3496,11 +3492,18 @@ int DoTls13ServerHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
/* Handle async operation */ /* Handle async operation */
if (ret == WC_PENDING_E) { if (ret == WC_PENDING_E) {
/* Mark message as not received so it can process again */ /* Mark message as not received so it can process again */
ssl->msgsReceived.got_server_hello--; ssl->msgsReceived.got_server_hello = 0;
} }
#endif #endif
return ret; return ret;
} }
if (*extMsgType == hello_retry_request) {
/* Update counts to reflect change of message type. */
ssl->msgsReceived.got_hello_retry_request = 1;
ssl->msgsReceived.got_server_hello = 0;
}
args->idx += args->totalExtSz; args->idx += args->totalExtSz;
} }