diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/include/pg_config.h.in | 3 | ||||
| -rw-r--r-- | src/include/pg_config.h.win32 | 3 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-secure-openssl.c | 9 |
3 files changed, 0 insertions, 15 deletions
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 0d77f2aafd1..050c48b108b 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -512,9 +512,6 @@ /* Define to 1 if you have the `srandom' function. */ #undef HAVE_SRANDOM -/* Define to 1 if you have the `SSL_clear_options' function. */ -#undef HAVE_SSL_CLEAR_OPTIONS - /* Define to 1 if stdbool.h conforms to C99. */ #undef HAVE_STDBOOL_H diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 467fb89ee61..09cedd0bda1 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -370,9 +370,6 @@ /* Define to 1 if you have the `srandom' function. */ /* #undef HAVE_SRANDOM */ -/* Define to 1 if you have the `SSL_clear_options' function. */ -#define HAVE_SSL_CLEAR_OPTIONS 1 - /* Define to 1 if stdbool.h conforms to C99. */ #define HAVE_STDBOOL_H 1 diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index cba81f63c0d..c71da75cfd5 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -1198,18 +1198,9 @@ initialize_SSL(PGconn *conn) #ifdef SSL_OP_NO_COMPRESSION if (conn->sslcompression && conn->sslcompression[0] == '0') SSL_set_options(conn->ssl, SSL_OP_NO_COMPRESSION); - - /* - * Mainline OpenSSL introduced SSL_clear_options() before - * SSL_OP_NO_COMPRESSION, so this following #ifdef should not be - * necessary, but some old NetBSD version have a locally modified libssl - * that has SSL_OP_NO_COMPRESSION but not SSL_clear_options(). - */ -#ifdef HAVE_SSL_CLEAR_OPTIONS else SSL_clear_options(conn->ssl, SSL_OP_NO_COMPRESSION); #endif -#endif return 0; } |