diff options
| author | Sara Golemon <sara.golemon@mongodb.com> | 2018-06-06 12:49:37 -0400 |
|---|---|---|
| committer | Sara Golemon <sara.golemon@mongodb.com> | 2018-06-08 13:10:56 -0400 |
| commit | 4448250e1aa4f778af67fc93176b0d07b3762a1f (patch) | |
| tree | ce07a0d3fc461ba7dacfec347c644e167664dddd /src/mongo/util/version.cpp | |
| parent | b0ba1c3935e4793edb32eece425fb5fb48892d1e (diff) | |
| download | mongo-4448250e1aa4f778af67fc93176b0d07b3762a1f.tar.gz | |
SERVER-35412 Namespace SSL_PROVIDER values
Diffstat (limited to 'src/mongo/util/version.cpp')
| -rw-r--r-- | src/mongo/util/version.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mongo/util/version.cpp b/src/mongo/util/version.cpp index 3df27505eec..137c490ce35 100644 --- a/src/mongo/util/version.cpp +++ b/src/mongo/util/version.cpp @@ -34,7 +34,7 @@ #include "mongo/config.h" #ifdef MONGO_CONFIG_SSL -#if MONGO_CONFIG_SSL_PROVIDER == SSL_PROVIDER_OPENSSL +#if MONGO_CONFIG_SSL_PROVIDER == MONGO_CONFIG_SSL_PROVIDER_OPENSSL #include <openssl/crypto.h> #endif #endif @@ -147,12 +147,12 @@ void VersionInfoInterface::appendBuildInfo(BSONObjBuilder* result) const { BSONObjBuilder opensslInfo(result->subobjStart("openssl")); #ifdef MONGO_CONFIG_SSL -#if MONGO_CONFIG_SSL_PROVIDER == SSL_PROVIDER_OPENSSL +#if MONGO_CONFIG_SSL_PROVIDER == MONGO_CONFIG_SSL_PROVIDER_OPENSSL opensslInfo << "running" << openSSLVersion() << "compiled" << OPENSSL_VERSION_TEXT; -#elif MONGO_CONFIG_SSL_PROVIDER == SSL_PROVIDER_WINDOWS +#elif MONGO_CONFIG_SSL_PROVIDER == MONGO_CONFIG_SSL_PROVIDER_WINDOWS opensslInfo << "running" << "Windows SChannel"; -#elif MONGO_CONFIG_SSL_PROVIDER == SSL_PROVIDER_APPLE +#elif MONGO_CONFIG_SSL_PROVIDER == MONGO_CONFIG_SSL_PROVIDER_APPLE opensslInfo << "running" << "Apple Secure Transport"; #else @@ -180,9 +180,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 +#if !defined(MONGO_CONFIG_SSL) || MONGO_CONFIG_SSL_PROVIDER != MONGO_CONFIG_SSL_PROVIDER_OPENSSL return ""; -#elif MONGO_CONFIG_SSL_PROVIDER == SSL_PROVIDER_OPENSSL +#elif MONGO_CONFIG_SSL_PROVIDER == MONGO_CONFIG_SSL_PROVIDER_OPENSSL return prefix.toString() + SSLeay_version(SSLEAY_VERSION) + suffix; #endif } @@ -194,7 +194,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 +#if defined(MONGO_CONFIG_SSL) && MONGO_CONFIG_SSL_PROVIDER == MONGO_CONFIG_SSL_PROVIDER_OPENSSL log() << openSSLVersion("OpenSSL version: "); #endif |