aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Gustafsson <dgustafsson@postgresql.org>2024-08-19 12:55:11 +0200
committerDaniel Gustafsson <dgustafsson@postgresql.org>2024-08-19 12:55:11 +0200
commit23c200940eae6e7d9cf5712c3514691bfdaf3904 (patch)
treecfabd22b80fc169486c5f9e642ceef33d1e282c9
parentc1bb534bae431f4bbc50abf471507457e1b24efc (diff)
downloadpostgresql-23c200940eae6e7d9cf5712c3514691bfdaf3904.tar.gz
postgresql-23c200940eae6e7d9cf5712c3514691bfdaf3904.zip
Fix regression in TLS session ticket disabling
Commit 274bbced disabled session tickets for TLSv1.3 on top of the already disabled TLSv1.2 session tickets, but accidentally caused a regression where TLSv1.2 session tickets were incorrectly sent. Fix by unconditionally disabling TLSv1.2 session tickets and only disable TLSv1.3 tickets when the right version of OpenSSL is used. Backpatch to all supported branches. Reported-by: Cameron Vogt <cvogt@automaticcontrols.net> Reported-by: Fire Emerald <fire.github@gmail.com> Reviewed-by: Jacob Champion <jacob.champion@enterprisedb.com> Discussion: https://postgr.es/m/DM6PR16MB3145CF62857226F350C710D1AB852@DM6PR16MB3145.namprd16.prod.outlook.com Backpatch-through: v12
-rw-r--r--src/backend/libpq/be-secure-openssl.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c
index ad4b005dc86..b0492c443ec 100644
--- a/src/backend/libpq/be-secure-openssl.c
+++ b/src/backend/libpq/be-secure-openssl.c
@@ -260,9 +260,8 @@ be_tls_init(bool isServerStart)
*/
#ifdef HAVE_SSL_CTX_SET_NUM_TICKETS
SSL_CTX_set_num_tickets(context, 0);
-#else
- SSL_CTX_set_options(context, SSL_OP_NO_TICKET);
#endif
+ SSL_CTX_set_options(context, SSL_OP_NO_TICKET);
/* disallow SSL session caching, too */
SSL_CTX_set_session_cache_mode(context, SSL_SESS_CACHE_OFF);