commit 4bbfe6120e71b81df7f23dcc246990c29eb27859
author James E. King, III <jim.king@simplivity.com> Thu Sep 29 15:04:09 2016 -0400
committer Nobuaki Sukegawa <nsuke@apache.org> Sat Oct 01 23:40:03 2016 +0900
tree b748816a9c26df30d82ad559ed0511350c001108
parent 4d39ac5240ec5f25faebfefa26e30389a1cf417f

THRIFT-3878: fix interop with newer OpenSSL libraries

This closes #1102

lib/cpp/src/thrift/transport/TSSLSocket.cpp

diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.cpp b/lib/cpp/src/thrift/transport/TSSLSocket.cpp
index 517151f..1efb9f7 100644
--- a/lib/cpp/src/thrift/transport/TSSLSocket.cpp
+++ b/lib/cpp/src/thrift/transport/TSSLSocket.cpp
@@ -108,7 +108,12 @@
   SSL_library_init();
   SSL_load_error_strings();
   // static locking
+  // newer versions of OpenSSL changed CRYPTO_num_locks - see THRIFT-3878
+#ifdef CRYPTO_num_locks
+  mutexes = boost::shared_array<Mutex>(new Mutex[CRYPTO_num_locks()]);
+#else
   mutexes = boost::shared_array<Mutex>(new Mutex[ ::CRYPTO_num_locks()]);
+#endif
   if (mutexes == NULL) {
     throw TTransportException(TTransportException::INTERNAL_ERROR,
                               "initializeOpenSSL() failed, "