]> git.ipfire.org Git - thirdparty/openssl.git/commit
Reject TLS 1.3 early data when PSK ciphersuite differs master
authorMounir IDRASSI <mounir.idrassi@idrix.fr>
Sat, 6 Jun 2026 13:08:42 +0000 (22:08 +0900)
committerNorbert Pocs <norbertp@openssl.org>
Wed, 5 Aug 2026 08:16:38 +0000 (10:16 +0200)
commit9c4d2c7bff92e678b88a5964a11c7057925a0bbb
tree35b8f6c4ff9039e3c3b3a224530eb23e4718490b
parentba75c9045111222fbcd2e3dfa45774a9abeff136
Reject TLS 1.3 early data when PSK ciphersuite differs

TLS 1.3 PSK resumption can use any ciphersuite with the same hash, but 0-RTT
acceptance requires the selected ciphersuite to match the one associated with
the selected PSK.

Keep same-hash PSK resumption working and reject only early data on a
ciphersuite mismatch. Document the user-visible fix in CHANGES.md.

Also updated RFC8446 references in ssl/*.[ch] code comments to corresponding
RFC9846 locations.

Fixes #31803

Reviewed-by: Bob Beck <beck@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
MergeDate: Wed Aug  5 08:16:57 2026
(Merged from https://github.com/openssl/openssl/pull/32032)
CHANGES.md
ssl/statem/extensions_srvr.c
ssl/statem/statem_clnt.c
ssl/statem/statem_lib.c
ssl/statem/statem_local.h
ssl/statem/statem_srvr.c
ssl/t1_lib.c
test/sslapitest.c