diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/libpq/be-secure-openssl.c | 2 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-secure-openssl.c | 5 | ||||
| -rw-r--r-- | src/test/ssl/t/SSLServer.pm | 4 |
3 files changed, 1 insertions, 10 deletions
diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c index 7ad32116eab..62f1fcab2b0 100644 --- a/src/backend/libpq/be-secure-openssl.c +++ b/src/backend/libpq/be-secure-openssl.c @@ -223,9 +223,7 @@ be_tls_init(bool isServerStart) } /* disallow SSL session tickets */ -#ifdef SSL_OP_NO_TICKET /* added in OpenSSL 0.9.8f */ SSL_CTX_set_options(context, SSL_OP_NO_TICKET); -#endif /* disallow SSL session caching, too */ SSL_CTX_set_session_cache_mode(context, SSL_SESS_CACHE_OFF); diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index ce8e252c091..0e84fc8ac6f 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -1192,15 +1192,12 @@ initialize_SSL(PGconn *conn) SSL_set_verify(conn->ssl, SSL_VERIFY_PEER, verify_cb); /* - * Set compression option if the OpenSSL version used supports it (from - * 1.0.0 on). + * Set compression option if necessary. */ -#ifdef SSL_OP_NO_COMPRESSION if (conn->sslcompression && conn->sslcompression[0] == '0') SSL_set_options(conn->ssl, SSL_OP_NO_COMPRESSION); else SSL_clear_options(conn->ssl, SSL_OP_NO_COMPRESSION); -#endif return 0; } diff --git a/src/test/ssl/t/SSLServer.pm b/src/test/ssl/t/SSLServer.pm index 26b5964f4fe..005955a2ff7 100644 --- a/src/test/ssl/t/SSLServer.pm +++ b/src/test/ssl/t/SSLServer.pm @@ -132,10 +132,6 @@ sub configure_test_server_for_ssl print $conf "listen_addresses='$serverhost'\n"; print $conf "log_statement=all\n"; - # Accept even old TLS versions so that builds with older OpenSSL - # can run the test suite. - print $conf "ssl_min_protocol_version='TLSv1'\n"; - # enable SSL and set up server key print $conf "include 'sslconfig.conf'\n"; |