summaryrefslogtreecommitdiffstats
path: root/rpc/rpc-transport/socket
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2015-06-09 16:32:37 +0200
committerRaghavendra G <rgowdapp@redhat.com>2015-06-11 01:33:09 -0700
commit515feb9885c193255121342540eac07f77b4b580 (patch)
tree96dbfa2eda42c092f37ce62e3ab99f7e901ffd33 /rpc/rpc-transport/socket
parent71f27128cb9e842fe5b0b9aa05e21fdc8147f52e (diff)
build: improve detection of new OpenSSL features
Building on Mac OS X revealed that the current check for CRYPTO_THREADID_set_callback() availability in OpenSSL is not correct. There also does not seem to be a guarantee that TLSv1_2_method() is available when TLS1_2_VERSION is #define'd. Change-Id: I21508065fc181a1c74bee4fd6d23bb5bdf7cea7a BUG: 1222317 Original-author: Kaleb KEITHLEY <kkeithle@redhat.com> Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: http://review.gluster.org/11140 Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com> Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Raghavendra G <rgowdapp@redhat.com> Tested-by: Raghavendra G <rgowdapp@redhat.com>
Diffstat (limited to 'rpc/rpc-transport/socket')
-rw-r--r--rpc/rpc-transport/socket/src/socket.c2
1 files changed, 1 insertions, 1 deletions
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