Index: branches/2018Q3/databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp
===================================================================
--- branches/2018Q3/databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp	(revision 474247)
+++ branches/2018Q3/databases/mongodb34/files/patch-src_mongo_crypto_sha1__block__openssl.cpp	(revision 474248)
@@ -1,11 +1,11 @@
 --- src/mongo/crypto/sha1_block_openssl.cpp.orig	2017-06-27 19:02:43 UTC
 +++ src/mongo/crypto/sha1_block_openssl.cpp
 @@ -42,7 +42,7 @@
  #include <openssl/evp.h>
  #include <openssl/hmac.h>
  #include <openssl/sha.h>
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#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.
Index: branches/2018Q3/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp
===================================================================
--- branches/2018Q3/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp	(revision 474247)
+++ branches/2018Q3/databases/mongodb34/files/patch-src_mongo_util_net_ssl__manager.cpp	(revision 474248)
@@ -1,11 +1,11 @@
 --- src/mongo/util/net/ssl_manager.cpp.orig	2017-06-08 16:11:03 UTC
 +++ src/mongo/util/net/ssl_manager.cpp
 @@ -125,7 +125,7 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(ASN1_SEQUE
  #endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS
  // clang-format on
  
 -#if OPENSSL_VERSION_NUMBER < 0x10100000L
-+#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.
Index: branches/2018Q3
===================================================================
--- branches/2018Q3	(revision 474247)
+++ branches/2018Q3	(revision 474248)

Property changes on: branches/2018Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r474176