diff options
Diffstat (limited to 'meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0006-THRIFT-3736-C++-library-build-fails-if-OpenSSL-does-.patch')
| -rw-r--r-- | meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0006-THRIFT-3736-C++-library-build-fails-if-OpenSSL-does-.patch | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0006-THRIFT-3736-C++-library-build-fails-if-OpenSSL-does-.patch b/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0006-THRIFT-3736-C++-library-build-fails-if-OpenSSL-does-.patch index 9c18171f1e..dfaa2fbda8 100644 --- a/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0006-THRIFT-3736-C++-library-build-fails-if-OpenSSL-does-.patch +++ b/meta-oe/recipes-connectivity/thrift/thrift-0.9.3/0006-THRIFT-3736-C++-library-build-fails-if-OpenSSL-does-.patch @@ -1,7 +1,8 @@ -From 53dc6e255bec2e4cd8bae85d14bec1cf28310d3f Mon Sep 17 00:00:00 2001 +From 4cd49f470ca983369451d1141acc80fe1115cab4 Mon Sep 17 00:00:00 2001 From: Nobuaki Sukegawa <nsuke@apache.org> Date: Sun, 13 Mar 2016 08:55:38 +0900 Subject: [PATCH] THRIFT-3736 C++ library build fails if OpenSSL does not + surrpot SSLv3 --- @@ -10,10 +11,10 @@ Subject: [PATCH] THRIFT-3736 C++ library build fails if OpenSSL does not 2 files changed, 10 insertions(+) diff --git a/lib/cpp/src/thrift/transport/TSSLSocket.cpp b/lib/cpp/src/thrift/transport/TSSLSocket.cpp -index bd13160260..517151f714 100644 +index 0a3a124..3e79354 100644 --- a/lib/cpp/src/thrift/transport/TSSLSocket.cpp +++ b/lib/cpp/src/thrift/transport/TSSLSocket.cpp -@@ -151,8 +151,10 @@ static char uppercase(char c); +@@ -145,8 +145,10 @@ static char uppercase(char c); SSLContext::SSLContext(const SSLProtocol& protocol) { if (protocol == SSLTLS) { ctx_ = SSL_CTX_new(SSLv23_method()); @@ -23,12 +24,12 @@ index bd13160260..517151f714 100644 +#endif } else if (protocol == TLSv1_0) { ctx_ = SSL_CTX_new(TLSv1_method()); - } else if (protocol == TLSv1_1) { + #if (OPENSSL_VERSION_NUMBER >= OPENSSL_VERSION_WITH_TLSv1_1_AND_TLSv1_2) diff --git a/lib/cpp/test/SecurityTest.cpp b/lib/cpp/test/SecurityTest.cpp -index 9968e2c478..23650d6280 100644 +index 213efd4..08110e7 100644 --- a/lib/cpp/test/SecurityTest.cpp +++ b/lib/cpp/test/SecurityTest.cpp -@@ -240,6 +240,14 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) +@@ -239,6 +239,14 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix) continue; } |