Skip to content

Cancel resumption if protocol changes #10015

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
rlm2002 wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −0
Draft

Cancel resumption if protocol changes #10015

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/tls13.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5275,6 +5275,12 @@ int DoTls13ServerHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
}
#endif /* WOLFSSL_DTLS13 */

if (ssl->options.resuming) {
WOLFSSL_MSG("Attempted resumption: negotiated version"
" downgraded from TLS 1.3, falling back to full handshake");
ssl->options.resuming = 0;
}

return DoServerHello(ssl, input, inOutIdx, helloSz);
}
}
Expand Down Expand Up @@ -5391,6 +5397,11 @@ int DoTls13ServerHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
}
#ifndef WOLFSSL_NO_TLS12
ssl->options.tls1_3 = 0;
if (ssl->options.resuming) {
WOLFSSL_MSG("Attempted resumption: negotiated version"
" downgraded from TLS 1.3, falling back to full handshake");
ssl->options.resuming = 0;
}
return DoServerHello(ssl, input, inOutIdx, helloSz);
#else
SendAlert(ssl, alert_fatal, wolfssl_alert_protocol_version);
Expand Down Expand Up @@ -5562,6 +5573,11 @@ int DoTls13ServerHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
else
ssl->chVersion.minor = TLSv1_2_MINOR;
/* Complete TLS v1.2 processing of ServerHello. */
if (ssl->options.resuming) {
WOLFSSL_MSG("Attempted resumption negotiated version"
" downgraded from TLS 1.3, falling back to full handshake");
ssl->options.resuming = 0;
}
ret = DoServerHello(ssl, input, inOutIdx, helloSz);
#else
WOLFSSL_MSG("Client using higher version, fatal error");
Expand Down
Loading