diff options
Diffstat (limited to 'contrib/native/client/src/clientlib/channel.cpp')
-rw-r--r-- | contrib/native/client/src/clientlib/channel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/native/client/src/clientlib/channel.cpp b/contrib/native/client/src/clientlib/channel.cpp index bdc19f7ad..3af17d6ee 100644 --- a/contrib/native/client/src/clientlib/channel.cpp +++ b/contrib/native/client/src/clientlib/channel.cpp @@ -210,12 +210,12 @@ ChannelContext* ChannelFactory::getChannelContext(channelType_t t, DrillUserProp verifyMode = boost::asio::ssl::context::verify_none; } - long customSSLCtxOptions = 0; + long customSSLCtxOptions = SSLChannelContext::ApplyMinTLSRestriction(protocol); std::string sslOptions; props->getProp(USERPROP_CUSTOM_SSLCTXOPTIONS, sslOptions); if (!sslOptions.empty()){ try{ - customSSLCtxOptions = boost::lexical_cast<long>(sslOptions); + customSSLCtxOptions |= boost::lexical_cast<long>(sslOptions); } catch (...){ DRILL_LOG(LOG_ERROR) << "Unable to parse custom SSL CTX options." << std::endl; |