wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 11:17:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for TLS v1.2 session resumption with tickets where the server decides to do a full handshake. The wrong sessionIDSz was being checked and should be the arrays one since it get set from the server_hello.

Browse Source
This commit is contained in:
David Garske
2024-10-23 14:53:00 -07:00
parent 031656ee7a
commit 25e32c2539
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/internal.c
View File

@ -17471,6 +17471,18 @@ int DoHandShakeMsgType(WOLFSSL* ssl, byte* input, word32* inOutIdx,
case certificate_request: case certificate_request:
case server_hello_done: case server_hello_done:
if (ssl->options.resuming) { if (ssl->options.resuming) {
/* Client requested resumption, but server is doing a
* full handshake */
/* The server's decision to resume isn't known until after the
* "server_hello". If subsequent handshake messages like
* "certificate" or "server_key_exchange" are recevied then we
* are doing a full handshake */
/* If the server included a session id then we
* treat this as a fatal error, since the server said it was
* doing resumption, but did not. */
/* https://www.rfc-editor.org/rfc/rfc5077.html#section-3.4 /* https://www.rfc-editor.org/rfc/rfc5077.html#section-3.4
* Alternatively, the client MAY include an empty Session ID * Alternatively, the client MAY include an empty Session ID
* in the ClientHello. In this case, the client ignores the * in the ClientHello. In this case, the client ignores the
@ -17479,7 +17491,7 @@ int DoHandShakeMsgType(WOLFSSL* ssl, byte* input, word32* inOutIdx,
* messages. * messages.
*/ */
#ifndef WOLFSSL_WPAS #ifndef WOLFSSL_WPAS
if (ssl->session->sessionIDSz != 0) { if (ssl->arrays->sessionIDSz != 0) {
/* Fatal error. Only try to send an alert. RFC 5246 does not /* Fatal error. Only try to send an alert. RFC 5246 does not
* allow for reverting back to a full handshake after the * allow for reverting back to a full handshake after the
* server has indicated the intention to do a resumption. */ * server has indicated the intention to do a resumption. */