[openssl/openssl] ecd8d3: Fix TLS 1.3 PSKs with SSL_VERIFY_PEER and no sid_ctx.

  Branch: refs/heads/master
  Home:   https://github.com/openssl/openssl
  Commit: ecd8d329f3476ee54629416738542df0d626a30f
      https://github.com/openssl/openssl/commit/ecd8d329f3476ee54629416738542df0d626a30f
  Author: Viktor Dukhovni <[email protected]>
  Date:   2026-07-21 (Tue, 21 Jul 2026)

  Changed paths:
    M ssl/ssl_local.h
    M ssl/ssl_sess.c
    M ssl/statem/extensions_srvr.c
    M ssl/statem/statem_srvr.c

  Log Message:
  -----------
  Fix TLS 1.3 PSKs with SSL_VERIFY_PEER and no sid_ctx.

A server with client certificate verification requested, but no
session ID context configured, wrongly rejected every TLS 1.3
PSK-based connection, whether a resumption ticket, or an external
PSK.  After a full non-PSK handshake the same server issued a
poison resumption PSK (session ticket) that led to handshake
failure if/when used.

The session ID context check exists to stop SSL acceptors with
distinct authentication policies that share a session cache from
resuming each other's sessions and trusting their authentication
results; it doesn't apply to a just-validated external PSK, so
the corresponding sessions are now exempted.  Ticket issuance is
also suppressed when it's already known that the ticket would lead
to a handshake failure with the same server's configuration.

Reviewed-by: Bob Beck <[email protected]>
Reviewed-by: Norbert Pocs <[email protected]>
MergeDate: Tue Jul 21 14:12:04 2026
(Merged from https://github.com/openssl/openssl/pull/31964)


  Commit: 4abb70d32719d15a1db1868484123a1f630b720b
      https://github.com/openssl/openssl/commit/4abb70d32719d15a1db1868484123a1f630b720b
  Author: Viktor Dukhovni <[email protected]>
  Date:   2026-07-21 (Tue, 21 Jul 2026)

  Changed paths:
    M ssl/statem/extensions_clnt.c
    M test/sslapitest.c

  Log Message:
  -----------
  PSK: Handle non-empty client sid_ctx

- Do not reject external PSKs when client-side sid_ctx is set, fixed
  by copying the sid_ctx into the pending session.

Tests added for this and also the server side sid_ctx issues.

Reviewed-by: Bob Beck <[email protected]>
Reviewed-by: Norbert Pocs <[email protected]>
MergeDate: Tue Jul 21 14:12:06 2026
(Merged from https://github.com/openssl/openssl/pull/31964)


  Commit: 9f8231027bcc9a895537fcab4e0a2e65afc9befc
      https://github.com/openssl/openssl/commit/9f8231027bcc9a895537fcab4e0a2e65afc9befc
  Author: Viktor Dukhovni <[email protected]>
  Date:   2026-07-21 (Tue, 21 Jul 2026)

  Changed paths:
    M CHANGES.md

  Log Message:
  -----------
  CHANGES.md updates

Reviewed-by: Bob Beck <[email protected]>
Reviewed-by: Norbert Pocs <[email protected]>
MergeDate: Tue Jul 21 14:12:07 2026
(Merged from https://github.com/openssl/openssl/pull/31964)


Compare: https://github.com/openssl/openssl/compare/4cef487f2a56...9f8231027bcc

To unsubscribe from these emails, change your notification settings at https://github.com/openssl/openssl/settings/notifications

-- 
You received this message because you are subscribed to the Google Groups "openssl-commits" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion visit https://groups.google.com/a/openssl.org/d/msgid/openssl-commits/openssl/openssl/push/refs/heads/master/4cef48-9f8231%40github.com.