diff options
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | src/include/pg_config.h.in | 4 | ||||
| -rw-r--r-- | src/include/pg_config.h.win32 | 4 | ||||
| -rw-r--r-- | src/tools/msvc/Solution.pm | 10 |
5 files changed, 25 insertions, 2 deletions
diff --git a/configure b/configure index 1577cf7ad37..dae02c86874 100755 --- a/configure +++ b/configure @@ -12063,7 +12063,11 @@ fi fi if test "$with_openssl" = yes ; then - if test "$PORTNAME" != "win32"; then + # Minimum required OpenSSL version is 0.9.8 + +$as_echo "#define OPENSSL_API_COMPAT 0x00908000L" >>confdefs.h + + if test "$PORTNAME" != "win32"; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CRYPTO_new_ex_data in -lcrypto" >&5 $as_echo_n "checking for CRYPTO_new_ex_data in -lcrypto... " >&6; } if ${ac_cv_lib_crypto_CRYPTO_new_ex_data+:} false; then : diff --git a/configure.in b/configure.in index 0b44e2119f0..29de083fe88 100644 --- a/configure.in +++ b/configure.in @@ -1269,6 +1269,9 @@ fi if test "$with_openssl" = yes ; then dnl Order matters! + # Minimum required OpenSSL version is 0.9.8 + AC_DEFINE(OPENSSL_API_COMPAT, [0x00908000L], + [Define to the OpenSSL API version in use. This avoids deprecation warnings from newer OpenSSL versions.]) if test "$PORTNAME" != "win32"; then AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])]) AC_CHECK_LIB(ssl, SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])]) diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in index 912132dbc5b..157b504ea6a 100644 --- a/src/include/pg_config.h.in +++ b/src/include/pg_config.h.in @@ -778,6 +778,10 @@ /* Define bytes to use libc memset(). */ #undef MEMSET_LOOP_LIMIT +/* Define to the OpenSSL API version in use. This avoids deprecation warnings + from newer OpenSSL versions. */ +#undef OPENSSL_API_COMPAT + /* Define to the address where bug reports for this package should be sent. */ #undef PACKAGE_BUGREPORT diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32 index 9510b982160..7fa151f41b4 100644 --- a/src/include/pg_config.h.win32 +++ b/src/include/pg_config.h.win32 @@ -628,6 +628,10 @@ /* Define bytes to use libc memset(). */ #define MEMSET_LOOP_LIMIT 1024 +/* Define to the OpenSSL API version in use. This avoids deprecation warnings + from newer OpenSSL versions. */ +#define OPENSSL_API_COMPAT 0x00908000L + /* Define to the address where bug reports for this package should be sent. */ #define PACKAGE_BUGREPORT "[email protected]" diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 984d63f5d77..c823655ed9a 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -151,6 +151,8 @@ sub GenerateFiles { my $self = shift; my $bits = $self->{platform} eq 'Win32' ? 32 : 64; + my $openssl_api_compat; + my $ac_define_openssl_api_compat_found = 0; # Parse configure.in to get version numbers open(my $c, '<', "configure.in") @@ -167,10 +169,15 @@ sub GenerateFiles $self->{numver} = sprintf("%d%04d", $1, $2 ? $2 : 0); $self->{majorver} = sprintf("%d", $1); } + elsif (/\bAC_DEFINE\(OPENSSL_API_COMPAT, \[([0-9xL]+)\]/) + { + $ac_define_openssl_api_compat_found = 1; + $openssl_api_compat = $1; + } } close($c); confess "Unable to parse configure.in for all variables!" - if ($self->{strver} eq '' || $self->{numver} eq ''); + if ($self->{strver} eq '' || $self->{numver} eq '' || $ac_define_openssl_api_compat_found == 0); if (IsNewer("src/include/pg_config_os.h", "src/include/port/win32.h")) { @@ -254,6 +261,7 @@ sub GenerateFiles if ($self->{options}->{openssl}) { print $o "#define USE_OPENSSL 1\n"; + print $o "#define OPENSSL_API_COMPAT $openssl_api_compat\n"; my ($digit1, $digit2, $digit3) = $self->GetOpenSSLVersion(); |