diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2018-02-07 11:23:32 -0500 |
|---|---|---|
| committer | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2018-02-07 11:23:32 -0500 |
| commit | 5f86a8e4ca87f169dc708b15b13a26c2bb514762 (patch) | |
| tree | f312d8f95b314906b539ea44c963bf74e0b5b7c4 /src/mongo/util/version.cpp | |
| parent | ad223ea38846ceac92d7b5356add62e23e985537 (diff) | |
| download | mongo-5f86a8e4ca87f169dc708b15b13a26c2bb514762.tar.gz | |
Revert "SERVER-22411 Add stub implementation of ASIO SChannel integration"
This reverts commit ad223ea38846ceac92d7b5356add62e23e985537.
Diffstat (limited to 'src/mongo/util/version.cpp')
| -rw-r--r-- | src/mongo/util/version.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/mongo/util/version.cpp b/src/mongo/util/version.cpp index 9536caf1516..41933e8c9ac 100644 --- a/src/mongo/util/version.cpp +++ b/src/mongo/util/version.cpp @@ -34,10 +34,8 @@ #include "mongo/config.h" #ifdef MONGO_CONFIG_SSL -#if MONGO_CONFIG_SSL_PROVIDER == SSL_PROVIDER_OPENSSL #include <openssl/crypto.h> #endif -#endif #include <pcrecpp.h> @@ -147,13 +145,7 @@ void VersionInfoInterface::appendBuildInfo(BSONObjBuilder* result) const { BSONObjBuilder opensslInfo(result->subobjStart("openssl")); #ifdef MONGO_CONFIG_SSL -#if MONGO_CONFIG_SSL_PROVIDER == SSL_PROVIDER_OPENSSL opensslInfo << "running" << openSSLVersion() << "compiled" << OPENSSL_VERSION_TEXT; -#elif MONGO_CONFIG_SSL_PROVIDER == SSL_PROVIDER_WINDOWS - opensslInfo << "Windows SChannel"; -#else -#error "Unknown SSL Provider" -#endif // MONGO_CONFIG_SSL_PROVIDER #else opensslInfo << "running" << "disabled" @@ -176,9 +168,9 @@ void VersionInfoInterface::appendBuildInfo(BSONObjBuilder* result) const { } std::string VersionInfoInterface::openSSLVersion(StringData prefix, StringData suffix) const { -#if !defined(MONGO_CONFIG_SSL) || MONGO_CONFIG_SSL_PROVIDER != SSL_PROVIDER_OPENSSL +#ifndef MONGO_CONFIG_SSL return ""; -#elif MONGO_CONFIG_SSL_PROVIDER == SSL_PROVIDER_OPENSSL +#else return prefix.toString() + SSLeay_version(SSLEAY_VERSION) + suffix; #endif } @@ -190,7 +182,7 @@ void VersionInfoInterface::logTargetMinOS() const { void VersionInfoInterface::logBuildInfo() const { log() << "git version: " << gitVersion(); -#if defined(MONGO_CONFIG_SSL) && MONGO_CONFIG_SSL_PROVIDER == SSL_PROVIDER_OPENSSL +#ifdef MONGO_CONFIG_SSL log() << openSSLVersion("OpenSSL version: "); #endif |