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

TLS 1.3: ability to turn peek change off

Browse Source 
Allow post-handshake peeking for handshaking messages to be disabled.
Not all customers want to handle this.
Clear WOLFSSL_ERROR_WANT_READ error on entry to ReceiveData which was
set when peeking found handshake message.
This commit is contained in:
Sean Parkinson
2021-07-14 09:33:43 +10:00
parent 81f3f417e8
commit 2959902a10
1 changed files with 8 additions and 1 deletions
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.
*/ */
@ -19099,7 +19104,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;
} }
@ -19209,6 +19214,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) {
@ -19219,6 +19225,7 @@ startScr:
} }
} }
#endif #endif
#endif
} }
size = min(sz, (int)ssl->buffers.clearOutputBuffer.length); size = min(sz, (int)ssl->buffers.clearOutputBuffer.length);