diff options
| author | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2016-08-29 20:16:02 +0300 |
|---|---|---|
| committer | Heikki Linnakangas <heikki.linnakangas@iki.fi> | 2016-08-29 20:16:02 +0300 |
| commit | 9b7cd59af1afcfbd786921d5cf73befb5fefa2f7 (patch) | |
| tree | 6020bf1a8fbd72fa73ac490b2a72b2f50c9800db /src | |
| parent | cf34fdbbe1452b9e19c0956bc48494889e1b2777 (diff) | |
| download | postgresql-9b7cd59af1afcfbd786921d5cf73befb5fefa2f7.tar.gz postgresql-9b7cd59af1afcfbd786921d5cf73befb5fefa2f7.zip | |
Remove support for OpenSSL versions older than 0.9.8.
OpenSSL officially only supports 1.0.1 and newer. Some OS distributions
still provide patches for 0.9.8, but anything older than that is not
interesting anymore. Let's simplify things by removing compatibility code.
Andreas Karlsson, with small changes by me.
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/libpq/be-secure-openssl.c | 8 | ||||
| -rw-r--r-- | src/interfaces/libpq/fe-secure-openssl.c | 4 | ||||
| -rw-r--r-- | src/interfaces/libpq/libpq-int.h | 2 |
3 files changed, 3 insertions, 11 deletions
diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c index f6adb155c6e..e5f434ca17a 100644 --- a/src/backend/libpq/be-secure-openssl.c +++ b/src/backend/libpq/be-secure-openssl.c @@ -53,10 +53,8 @@ #include <openssl/ssl.h> #include <openssl/dh.h> -#if SSLEAY_VERSION_NUMBER >= 0x0907000L #include <openssl/conf.h> -#endif -#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_ECDH) +#ifndef OPENSSL_NO_ECDH #include <openssl/ec.h> #endif @@ -166,9 +164,7 @@ be_tls_init(void) if (!SSL_context) { -#if SSLEAY_VERSION_NUMBER >= 0x0907000L OPENSSL_config(NULL); -#endif SSL_library_init(); SSL_load_error_strings(); @@ -978,7 +974,7 @@ info_cb(const SSL *ssl, int type, int args) static void initialize_ecdh(void) { -#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) && !defined(OPENSSL_NO_ECDH) +#ifndef OPENSSL_NO_ECDH EC_KEY *ecdh; int nid; diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c index f6ce1c7a13d..d8716128ec9 100644 --- a/src/interfaces/libpq/fe-secure-openssl.c +++ b/src/interfaces/libpq/fe-secure-openssl.c @@ -54,9 +54,7 @@ #endif #include <openssl/ssl.h> -#if (SSLEAY_VERSION_NUMBER >= 0x00907000L) #include <openssl/conf.h> -#endif #ifdef USE_SSL_ENGINE #include <openssl/engine.h> #endif @@ -848,9 +846,7 @@ pgtls_init(PGconn *conn) { if (pq_init_ssl_lib) { -#if SSLEAY_VERSION_NUMBER >= 0x00907000L OPENSSL_config(NULL); -#endif SSL_library_init(); SSL_load_error_strings(); } diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index 1183323a445..a94ead04ff3 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -77,7 +77,7 @@ typedef struct #include <openssl/ssl.h> #include <openssl/err.h> -#if (SSLEAY_VERSION_NUMBER >= 0x00907000L) && !defined(OPENSSL_NO_ENGINE) +#ifndef OPENSSL_NO_ENGINE #define USE_SSL_ENGINE #endif #endif /* USE_OPENSSL */ |