diff options
Diffstat (limited to 'meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0005-THRIFT-3878-Compile-error-in-TSSLSocket.cpp-with-new.patch')
| -rw-r--r-- | meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0005-THRIFT-3878-Compile-error-in-TSSLSocket.cpp-with-new.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0005-THRIFT-3878-Compile-error-in-TSSLSocket.cpp-with-new.patch b/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0005-THRIFT-3878-Compile-error-in-TSSLSocket.cpp-with-new.patch new file mode 100644 index 0000000000..8d71056675 --- /dev/null +++ b/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0005-THRIFT-3878-Compile-error-in-TSSLSocket.cpp-with-new.patch @@ -0,0 +1,26 @@ +From cc4f32db13ddc62fbd1e316127c5a60f4080a2d3 Mon Sep 17 00:00:00 2001 +From: "James E. King, III" <jim.king@simplivity.com> +Date: Thu, 29 Sep 2016 15:04:09 -0400 +Subject: [PATCH] THRIFT-3878: fix interop with newer OpenSSL libraries + +--- + lib/cpp/src/thrift/transport/TSSLSocket.cpp | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.cpp b/lib/cpp/src/thrift/transport/TSSLSocket.cpp +index 517151f714..1efb9f7a47 100644 +--- a/lib/cpp/src/thrift/transport/TSSLSocket.cpp ++++ b/lib/cpp/src/thrift/transport/TSSLSocket.cpp +@@ -108,7 +108,12 @@ void initializeOpenSSL() { + 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, " |