WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #4203 from SparkiDev/tls13_peek_fix_off 

TLS 1.3: ability to turn peek change off
pull/4307/head
David Garske 2021-08-16 15:25:58 -07:00 committed by GitHub
parent c6f0fb11d0 2959902a10
commit 6ac03d41ef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/internal.c
View File

@ -60,6 +60,11 @@
* Default callback will not request creation of new ticket on successful * Default callback will not request creation of new ticket on successful
* decryption. * decryption.
* Server only. * Server only.
* WOLFSSL_TLS13_NO_PEEK_HANDSHAKE_DONE
* Once a normal TLS 1.3 handshake is complete, a session ticket message
* may be received by a client. To support detecting this, peek will
* return WOLFSSL_ERROR_WANT_READ.
* This define turns off this behaviour.
*/ */
@ -19411,7 +19416,7 @@ int ReceiveData(WOLFSSL* ssl, byte* output, int sz, int peek)
WOLFSSL_ENTER("ReceiveData()"); WOLFSSL_ENTER("ReceiveData()");
/* reset error state */ /* reset error state */
if (ssl->error == WANT_READ) { if (ssl->error == WANT_READ || ssl->error == WOLFSSL_ERROR_WANT_READ) {
ssl->error = 0; ssl->error = 0;
} }
@ -19521,6 +19526,7 @@ startScr:
} }
} }
#endif #endif
#ifndef WOLFSSL_TLS13_NO_PEEK_HANDSHAKE_DONE
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
if (IsAtLeastTLSv1_3(ssl->version) && ssl->options.handShakeDone && if (IsAtLeastTLSv1_3(ssl->version) && ssl->options.handShakeDone &&
ssl->curRL.type == handshake && peek) { ssl->curRL.type == handshake && peek) {
@ -19531,6 +19537,7 @@ startScr:
} }
} }
#endif #endif
#endif
} }
size = min(sz, (int)ssl->buffers.clearOutputBuffer.length); size = min(sz, (int)ssl->buffers.clearOutputBuffer.length);