MFH: r474192

Fix build with LibreSSL 2.7

PR:		229608

Approved by:	ports-secteam (build fix blanket)
This commit is contained in:
Michael Gmelin 2018-07-09 09:40:10 +00:00
parent bc7cb75174
commit ebfbb6a451
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/branches/2018Q3/; revision=474247
2 changed files with 22 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- src/mongo/crypto/sha_block_openssl.cpp.orig 2018-07-08 16:42:41.034894000 +0000
+++ src/mongo/crypto/sha_block_openssl.cpp 2018-07-08 16:42:58.121846000 +0000
@@ -44,7 +44,7 @@
#include <openssl/hmac.h>
#include <openssl/sha.h>
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
namespace {
// Copies of OpenSSL after 1.1.0 define new EVP digest routines. We must
// polyfill used definitions to interact with older OpenSSL versions.

View File

@ -0,0 +1,11 @@
--- src/mongo/util/net/ssl_manager.cpp.orig 2018-07-08 16:33:48.347433000 +0000
+++ src/mongo/util/net/ssl_manager.cpp 2018-07-08 16:34:49.098494000 +0000
@@ -237,7 +237,7 @@
#endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS
// clang-format on
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x2070000fL)
// Copies of OpenSSL after 1.1.0 define new functions for interaction with
// X509 structure. We must polyfill used definitions to interact with older
// OpenSSL versions.