valitydev/thrift
14
0
Fork 0
mirror of https://github.com/valitydev/thrift.git synced 2024-11-07 10:48:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

THRIFT-3736 C++ library build fails if OpenSSL does not surrpot SSLv3

Browse Source 
This closes #944
This commit is contained in:
Nobuaki Sukegawa 2016-03-13 08:55:38 +09:00
parent 6505312e0a
commit b819260c65
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/cpp/src/thrift/transport/TSSLSocket.cpp
View File

@ -151,8 +151,10 @@ static char uppercase(char c);
SSLContext::SSLContext(const SSLProtocol& protocol) {
if (protocol == SSLTLS) {
ctx_ = SSL_CTX_new(SSLv23_method());
#ifndef OPENSSL_NO_SSL3
} else if (protocol == SSLv3) {
ctx_ = SSL_CTX_new(SSLv3_method());
#endif
} else if (protocol == TLSv1_0) {
ctx_ = SSL_CTX_new(TLSv1_method());
} else if (protocol == TLSv1_1) {

8
lib/cpp/test/SecurityTest.cpp
View File

@ -240,6 +240,14 @@ BOOST_AUTO_TEST_CASE(ssl_security_matrix)
continue;
}
#ifdef OPENSSL_NO_SSL3
if (si == 2 || ci == 2)
{
// Skip all SSLv3 cases - protocol not supported
continue;
}
#endif
boost::mutex::scoped_lock lock(mMutex);
BOOST_TEST_MESSAGE(boost::format("TEST: Server = %1%, Client = %2%")