Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed openssl issue with 1.1 (#3095)

This commit is contained in:
Kaveh Vahedipour 2017-08-22 15:50:25 +02:00 committed by Frank Celler
parent 536625a50a
commit a8304904ed
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -800,6 +800,8 @@ find_package(OpenSSL REQUIRED)
include_directories(${OPENSSL_INCLUDE_DIR})
add_definitions(-DARANGODB_OPENSSL_VERSION=\"${OPENSSL_VERSION}\")
add_definitions(-DOPENSSL_VERSION_MAJOR=${OPENSSL_VERSION_MAJOR})
add_definitions(-DOPENSSL_VERSION_MINOR=${OPENSSL_VERSION_MINOR})
if (OPENSSL_VERSION)
string(REPLACE "." ";" OPENSSL_VERSION_LIST ${OPENSSL_VERSION})

14
lib/SimpleHttpClient/SslClientConnection.cpp
View File

@ -235,19 +235,29 @@ void SslClientConnection::init(uint64_t sslProtocol) {
meth = SSLv23_method();
break;
#if defined OPENSSL_VERSION_MAJOR && OPENSSL_VERSION_MAJOR == 1
#if defined OPENSSL_VERSION_MINOR && OPENSSL_VERSION_MINOR >= 1
case TLS_V1:
case TLS_V12:
case SSL_UNKNOWN:
default:
// default is to use TLSv13
meth = TLS_method();
break;
#else
case TLS_V1:
meth = TLSv1_method();
break;
case TLS_V12:
meth = TLSv1_2_method();
break;
case SSL_UNKNOWN:
default:
// default is to use TLSv12
meth = TLSv1_2_method();
break;
#endif
#endif
}
_ctx = SSL_CTX_new(meth);