diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | rpc/rpc-transport/socket/src/socket.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index fad2874c70a..9a0cb7ba91d 100644 --- a/configure.ac +++ b/configure.ac @@ -534,8 +534,9 @@ fi AM_CONDITIONAL([ENABLE_BD_XLATOR], [test x$BUILD_BD_XLATOR = xyes]) dnl check for old openssl -AC_CHECK_FUNC([ssl], [CRYPTO_THREADID_set_callback], [HAVE_CRYPTO_THREADID=1], HAVE_CRYPTO_THREADID=0) -AC_DEFINE(HAVE_CRYPTO_THREADID, $HAVE_CRYPTO_THREADID, [use new OpenSSL functions]) +AC_CHECK_LIB([crypto], CRYPTO_THREADID_set_callback, [AC_DEFINE([HAVE_CRYPTO_THREADID], [1], [use new OpenSSL functions])]) + +AC_CHECK_LIB([ssl], TLSv1_2_method, [AC_DEFINE([HAVE_TLSV1_2_METHOD], [1], [use new OpenSSL functions])]) # start encryption/crypt section diff --git a/rpc/rpc-transport/socket/src/socket.c b/rpc/rpc-transport/socket/src/socket.c index 355a7888f14..e26407f63aa 100644 --- a/rpc/rpc-transport/socket/src/socket.c +++ b/rpc/rpc-transport/socket/src/socket.c @@ -4000,7 +4000,7 @@ socket_init (rpc_transport_t *this) goto err; } -#if defined(TLS1_2_VERSION) +#if HAVE_TLSV1_2_METHOD priv->ssl_meth = (SSL_METHOD *)TLSv1_2_method(); #else /* old openssl */ #warning TLSv1.2 is not available, using insecure TLSv1 support |