Attachment #208113 for bug #241078

Lines 2-8 Link Here

(-)mongodb34.23/Makefile (-3 / +4 lines)
2		2
3	PORTNAME= mongodb	3	PORTNAME= mongodb
4	DISTVERSIONPREFIX= r	4	DISTVERSIONPREFIX= r
5	DISTVERSION= 3.4.22	5	DISTVERSION= 3.4.23
6	#PORTREVISION= 1	6	#PORTREVISION= 1
7	CATEGORIES= databases net	7	CATEGORIES= databases net
8	MASTER_SITES= https://fastdl.mongodb.org/src/ \	8	MASTER_SITES= https://fastdl.mongodb.org/src/ \
Lines 18-24 Link Here
18	LICENSE= AGPLv3 APACHE20	18	LICENSE= AGPLv3 APACHE20
19	LICENSE_COMB= multi	19	LICENSE_COMB= multi
20		20
21	ONLY_FOR_ARCHS= amd64 aarch64	21	ONLY_FOR_ARCHS= aarch64 amd64
22	ONLY_FOR_ARCHS_REASON= "Only supported on amd64 and aarch64 (i386 deprecated in v3)"	22	ONLY_FOR_ARCHS_REASON= "Only supported on amd64 and aarch64 (i386 deprecated in v3)"
23		23
24	LIB_DEPENDS= libpcre.so:devel/pcre \	24	LIB_DEPENDS= libpcre.so:devel/pcre \
Lines 27-36 Link Here
27	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \	27	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=3.11:devel/py-yaml@${PY_FLAVOR} \
28	${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo@${PY_FLAVOR}	28	${PYTHON_PKGNAMEPREFIX}pymongo>=3.0:databases/pymongo@${PY_FLAVOR}
29		29
		30	USES= compiler:c++14-lang cpe dos2unix python:build scons
		31
30	CONFLICTS_BUILD= mongo-cxx-driver	32	CONFLICTS_BUILD= mongo-cxx-driver
31	CONFLICTS_INSTALL= mongodb36 mongodb40	33	CONFLICTS_INSTALL= mongodb36 mongodb40
32		34
33	USES= compiler:c++14-lang cpe dos2unix python:build scons
34	DOS2UNIX_FILES= src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h	35	DOS2UNIX_FILES= src/third_party/IntelRDFPMathLib20U1/LIBRARY/src/bid_functions.h
35		36
36	USE_RC_SUBR= mongod	37	USE_RC_SUBR= mongod

Lines 1-3 Link Here

(-)mongodb34.23/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1565177038	1	TIMESTAMP = 1570244898
2	SHA256 (mongodb-src-r3.4.22.tar.gz) = de46ef5a6cb2fde1889a1c3dfc7b1d4e1f342614c58e93963bde88954cce3fe6	2	SHA256 (mongodb-src-r3.4.23.tar.gz) = 8a8bfad7a0c115e6101d9c823ccff76e4fd619367c6f700f1323827063113c9f
3	SIZE (mongodb-src-r3.4.22.tar.gz) = 40172095	3	SIZE (mongodb-src-r3.4.23.tar.gz) = 40176687




--- SConstruct.orig	2019-09-04 17:33:32 UTC
+++ SConstruct
@@ -936,9 +936,9 @@ if has_option('variables-help'):
     print env_vars.GenerateHelpText(env)
     Exit(0)
 

 
 def set_config_header_define(env, varname, varval = 1):
     env['CONFIG_HEADER_DEFINES'][varname] = varval
@@ -1557,7 +1557,7 @@ if env.TargetOSIs('posix'):
             # If runtime hardening is requested, then build anything
             # destined for an executable with the necessary flags for PIE.
             env.AppendUnique(

                 PROGLINKFLAGS=['-pie'],
             )
 
@@ -1571,7 +1571,7 @@ if env.TargetOSIs('posix'):
                          "-Wno-unknown-pragmas",
                          "-Winvalid-pch"] )
     # env.Append( " -Wconversion" ) TODO: this doesn't really work yet

         if not has_option("disable-warnings-as-errors"):
             env.Append( CCFLAGS=["-Werror"] )
 
@@ -1599,19 +1599,19 @@ if env.TargetOSIs('posix'):
         env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
         env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
 

 
 mmapv1 = False
 if get_option('mmapv1') == 'auto':
@@ -2468,7 +2468,7 @@ def doConfigure(myenv):
         }}
         """.format(storage_class)
         context.Message('Checking for storage class {0} '.format(storage_class))




--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp.orig	2019-10-05 03:09:25 UTC
From: Christopher Kohlhoff <chris@kohlhoff.com>
Date: Fri, 20 Mar 2015 08:46:51 +1100
Subject: [PATCH] ERR_remove_state is deprecated, use ERR_remove_thread_state
 instead.

---
 asio/include/asio/ssl/detail/impl/openssl_init.ipp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
index 2c40d40..da66fc1 100644
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
@@ -63,7 +63,11 @@ public:
     ::CRYPTO_set_id_callback(0);
     ::CRYPTO_set_locking_callback(0);
     ::ERR_free_strings();
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
+    ::ERR_remove_thread_state(NULL);
+#else // (OPENSSL_VERSION_NUMBER >= 0x10000000L)
     ::ERR_remove_state(0);
+#endif // (OPENSSL_VERSION_NUMBER >= 0x10000000L)
     ::EVP_cleanup();
     ::CRYPTO_cleanup_all_ex_data();
     ::CONF_modules_unload(1);
From aa21de0944b4327f998fe161dde5ddaaf38cec5c Mon Sep 17 00:00:00 2001
From: Christopher Kohlhoff <chris@kohlhoff.com>
Date: Sat, 21 Mar 2015 20:52:42 +1100
Subject: [PATCH] Remove redundant pointer check in SSL engine.

---
 asio/include/asio/ssl/detail/impl/engine.ipp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp
index 5504411..2e4a39d 100644
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp
@@ -205,8 +205,10 @@ const asio::error_code& engine::map_error_code(
 
   // SSL v2 doesn't provide a protocol-level shutdown, so an eof on the
   // underlying transport is passed through.
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
   if (ssl_->version == SSL2_VERSION)
     return ec;
+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L)
 
   // Otherwise, the peer should have negotiated a proper shutdown.
From 6c70257e20ef159c581298b54838361bb54bfce4 Mon Sep 17 00:00:00 2001
From: Christopher Kohlhoff <chris@kohlhoff.com>
Date: Thu, 1 Oct 2015 08:44:30 +1000
Subject: [PATCH] Use SSL_CTX_clear_chain_certs, if available.

---
 asio/include/asio/ssl/impl/context.ipp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp
index 08705e7..77da84e 100644
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp
@@ -539,11 +539,15 @@ asio::error_code context::use_certificate_chain(
       return ec;
     }
 
+#if (OPENSSL_VERSION_NUMBER >= 0x10002000L)
+    ::SSL_CTX_clear_chain_certs(handle_);
+#else
     if (handle_->extra_certs)
     {
       ::sk_X509_pop_free(handle_->extra_certs, X509_free);
       handle_->extra_certs = 0;
     }
+#endif // (OPENSSL_VERSION_NUMBER >= 0x10002000L)
 
     while (X509* cacert = ::PEM_read_bio_X509(bio.p, 0,
           handle_->default_passwd_callback,
From 92bfc623e6a71353dd2c783f4c9fef5591ac550d Mon Sep 17 00:00:00 2001
From: Christopher Kohlhoff <chris@kohlhoff.com>
Date: Thu, 19 Nov 2015 10:24:56 +1100
Subject: [PATCH] Add new error category and constant for
 ssl::error::stream_truncated.

This error replaces uses of SSL_R_SHORT_READ, and indicates that the
SSL stream has been shut down abruptly. (I.e. the underlying socket
has been closed without performing an SSL-layer shutdown.)
---
 asio/include/asio/ssl/detail/impl/engine.ipp |  8 ++-----
 asio/include/asio/ssl/error.hpp              | 34 ++++++++++++++++++++++++++++
 asio/include/asio/ssl/impl/error.ipp         | 33 ++++++++++++++++++++++++++-
 3 files changed, 68 insertions(+), 7 deletions(-)

diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp
index b59cf18..9abe010 100644
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp
@@ -195,9 +195,7 @@ const asio::error_code& engine::map_error_code(
   // If there's data yet to be read, it's an error.
   if (BIO_wpending(ext_bio_))
   {
-    ec = asio::error_code(
-        ERR_PACK(ERR_LIB_SSL, 0, SSL_R_SHORT_READ),
-        asio::error::get_ssl_category());
+    ec = asio::ssl::error::stream_truncated;
     return ec;
   }
 
@@ -209,9 +207,7 @@ const asio::error_code& engine::map_error_code(
   // Otherwise, the peer should have negotiated a proper shutdown.
   if ((::SSL_get_shutdown(ssl_) & SSL_RECEIVED_SHUTDOWN) == 0)
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp.orig	2019-10-05 03:09:25 UTC
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
@@ -35,11 +35,11 @@ class openssl_init_base::do_init
 public:
   do_init()
   {
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     ::SSL_library_init();
     ::SSL_load_error_strings();        
     ::OpenSSL_add_all_algorithms();
   }
 
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     mutexes_.resize(::CRYPTO_num_locks());
     for (size_t i = 0; i < mutexes_.size(); ++i)
       mutexes_[i].reset(new asio::detail::mutex);
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/openssl_types.hpp.orig	2019-09-04 17:33:32 UTC
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/openssl_types.hpp
@@ -21,7 +21,9 @@
 #if !defined(OPENSSL_NO_ENGINE)
 # include <openssl/engine.h>
 #endif // !defined(OPENSSL_NO_ENGINE)
+#include <openssl/dh.h>
 #include <openssl/err.h>
+#include <openssl/rsa.h>
 #include <openssl/x509v3.h>
 #include "asio/detail/socket_types.hpp"
 
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/error.hpp.orig	2019-09-04 17:33:32 UTC
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/error.hpp
@@ -25,6 +25,7 @@ namespace error {
 

 };
 
 extern ASIO_DECL
@@ -34,6 +35,23 @@ ASIO_USED_VARIABLE static const asio::error_category& 
   = asio::error::get_ssl_category();
 
 } // namespace error

 } // namespace asio
 
 #if defined(ASIO_HAS_STD_SYSTEM_ERROR)
@@ -44,6 +62,11 @@ template<> struct is_error_code_enum<asio::error::ssl_
   static const bool value = true;
 };
 

 } // namespace asio
 
 #include "asio/detail/pop_options.hpp"
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp.orig	2019-10-05 03:09:25 UTC
index 9e76039..8c20e81 100644
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/error.ipp
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/error.ipp
@@ -23,7 +23,6 @@
 
 namespace asio {
 namespace error {
-
 namespace detail {
 
 class ssl_category : public asio::error_category
@@ -50,6 +49,38 @@ const asio::error_category& get_ssl_category()
 }
 
 } // namespace error
+namespace ssl {
+namespace error {
+namespace detail {
+
+class stream_category : public asio::error_category
+{
+public:
+  const char* name() const ASIO_ERROR_CATEGORY_NOEXCEPT
+  {
+    return "asio.ssl.stream";
+  }
+
+  std::string message(int value) const
+  {
+    switch (value)
+    {
+    case stream_truncated: return "stream truncated";
+    default: return "asio.ssl.stream error";
+    }
+  }
+};
+
+} // namespace detail
+
+const asio::error_category& get_stream_category()
+{
+  static detail::stream_category instance;
+  return instance;
+}
+
+} // namespace error
+} // namespace ssl
 } // namespace asio
 
 #include "asio/detail/pop_options.hpp"
From 5fa80539834c10406611bb02c20cdba2a9171f4a Mon Sep 17 00:00:00 2001
From: Christopher Kohlhoff <chris@kohlhoff.com>
Date: Thu, 19 Nov 2015 10:25:42 +1100
Subject: [PATCH] BoringSSL does not provide CONF_modules_unload.

---
 asio/include/asio/ssl/detail/impl/openssl_init.ipp | 2 ++
 1 file changed, 2 insertions(+)

diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
index da66fc1..2a70bf5 100644
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
@@ -70,7 +70,9 @@ public:
 #endif // (OPENSSL_VERSION_NUMBER >= 0x10000000L)
     ::EVP_cleanup();
     ::CRYPTO_cleanup_all_ex_data();
+#if !defined(OPENSSL_IS_BORINGSSL)
     ::CONF_modules_unload(1);
+#endif // !defined(OPENSSL_IS_BORINGSSL)
 #if !defined(OPENSSL_NO_ENGINE)
     ::ENGINE_cleanup();
 #endif // !defined(OPENSSL_NO_ENGINE)
From 062b19c97bb85f4625b46f93ee19b234948ff235 Mon Sep 17 00:00:00 2001
From: Marcel Raad <raad@teamviewer.com>
Date: Fri, 1 Apr 2016 10:46:17 +0200
Subject: [PATCH] Add compatibility with OpenSSL 1.1 - SSLv2 has been
 completely removed from OpenSSL, even without OPENSSL_NO_SSL2 - there is a
 new threading API without locking callbacks - struct SSL_CTX has been made
 opaque and must be used via accessor functions - some cleanup functions have
 been removed

---
 asio/include/asio/ssl/detail/impl/engine.ipp       |  2 +
 asio/include/asio/ssl/detail/impl/openssl_init.ipp | 20 ++++--
 asio/include/asio/ssl/impl/context.ipp             | 71 +++++++++++++++++-----
 3 files changed, 72 insertions(+), 21 deletions(-)

diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp
index fa5d4b0..22b7cdd 100644
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/engine.ipp
@@ -201,8 +201,10 @@ const asio::error_code& engine::map_error_code(
 
   // SSL v2 doesn't provide a protocol-level shutdown, so an eof on the
   // underlying transport is passed through.
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
   if (ssl_->version == SSL2_VERSION)
     return ec;
+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L)
 
   // Otherwise, the peer should have negotiated a proper shutdown.
   if ((::SSL_get_shutdown(ssl_) & SSL_RECEIVED_SHUTDOWN) == 0)
diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
index 700b678..62a49cd 100644
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
@@ -39,11 +39,13 @@ public:
     ::SSL_load_error_strings();        
     ::OpenSSL_add_all_algorithms();
 
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     mutexes_.resize(::CRYPTO_num_locks());
     for (size_t i = 0; i < mutexes_.size(); ++i)
       mutexes_[i].reset(new asio::detail::mutex);
     ::CRYPTO_set_locking_callback(&do_init::openssl_locking_func);
     ::CRYPTO_set_id_callback(&do_init::openssl_id_func);
+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L)
 
 #if !defined(SSL_OP_NO_COMPRESSION) \
   && (OPENSSL_VERSION_NUMBER >= 0x00908000L)
@@ -60,22 +62,26 @@ public:
 #endif // !defined(SSL_OP_NO_COMPRESSION)
        // && (OPENSSL_VERSION_NUMBER >= 0x00908000L)
 
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     ::CRYPTO_set_id_callback(0);
     ::CRYPTO_set_locking_callback(0);
     ::ERR_free_strings();
-#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
-    ::ERR_remove_thread_state(NULL);
-#else // (OPENSSL_VERSION_NUMBER >= 0x10000000L)
-    ::ERR_remove_state(0);
-#endif // (OPENSSL_VERSION_NUMBER >= 0x10000000L)
     ::EVP_cleanup();
     ::CRYPTO_cleanup_all_ex_data();
+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
+    ::ERR_remove_state(0);
+#elif (OPENSSL_VERSION_NUMBER < 0x10100000L)
+    ::ERR_remove_thread_state(NULL);
+#endif // (OPENSSL_VERSION_NUMBER < 0x10000000L)
 #if !defined(OPENSSL_IS_BORINGSSL)
     ::CONF_modules_unload(1);
 #endif // !defined(OPENSSL_IS_BORINGSSL)
-#if !defined(OPENSSL_NO_ENGINE)
+#if !defined(OPENSSL_NO_ENGINE) \
+  && (OPENSSL_VERSION_NUMBER < 0x10100000L)
     ::ENGINE_cleanup();
 #endif // !defined(OPENSSL_NO_ENGINE)
+       // && (OPENSSL_VERSION_NUMBER < 0x10100000L)
   }
 
 #if !defined(SSL_OP_NO_COMPRESSION) \
@@ -104,10 +110,12 @@ private:
   static void openssl_locking_func(int mode, int n, 
     const char* /*file*/, int /*line*/)
   {
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     if (mode & CRYPTO_LOCK)
       instance()->mutexes_[n]->lock();
     else
       instance()->mutexes_[n]->unlock();
+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L)
   }
 
   // Mutexes to be used in locking callbacks.
diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp
index 02210d9..fde7709 100644
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/context.ipp
@@ -66,7 +66,8 @@ context::context(context::method m)
 

     }
 
     if (SSL_CTX_get_app_data(handle_))
@@ -528,10 +540,17 @@ asio::error_code context::use_certificate_chain(
   bio_cleanup bio = { make_buffer_bio(chain) };
   if (bio.p)
   {

     if (!cert.p)
     {
       ec = asio::error_code(ERR_R_PEM_LIB,
@@ -559,8 +578,8 @@ asio::error_code context::use_certificate_chain(
 #endif // (OPENSSL_VERSION_NUMBER >= 0x10002000L)
 
     while (X509* cacert = ::PEM_read_bio_X509(bio.p, 0,

     {
       if (!::SSL_CTX_add_extra_chain_cert(handle_, cacert))
       {
@@ -625,6 +644,14 @@ asio::error_code context::use_private_key(
 {
   ::ERR_clear_error();
 

   bio_cleanup bio = { make_buffer_bio(private_key) };
   if (bio.p)
   {
@@ -636,8 +663,8 @@ asio::error_code context::use_private_key(
       break;
     case context_base::pem:
       evp_private_key.p = ::PEM_read_bio_PrivateKey(

       break;
     default:
       {
@@ -684,6 +711,14 @@ asio::error_code context::use_rsa_private_key(
 {
   ::ERR_clear_error();
 

   bio_cleanup bio = { make_buffer_bio(private_key) };
   if (bio.p)
   {
@@ -695,8 +730,8 @@ asio::error_code context::use_rsa_private_key(
       break;
     case context_base::pem:
       rsa_private_key.p = ::PEM_read_bio_RSAPrivateKey(

       break;
     default:
       {
@@ -915,11 +950,17 @@ int context::verify_callback_function(int preverified,
 asio::error_code context::do_set_password_callback(
     detail::password_callback_base* callback, asio::error_code& ec)
 {
-  if (handle_->default_passwd_callback_userdata)

 
   SSL_CTX_set_default_passwd_cb(handle_, &context::password_callback_function);
 
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/error.ipp.orig	2019-09-04 17:33:32 UTC
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/impl/error.ipp
@@ -23,7 +23,6 @@
Subject: [PATCH] Fix errors when OPENSSL_NO_DEPRECATED is defined.

---
 asio/include/asio/ssl/detail/impl/openssl_init.ipp | 23 +++++++++++-----------
 asio/include/asio/ssl/detail/openssl_types.hpp     |  2 ++
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
index 62a49cd..4cc9859 100644
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
@@ -44,8 +44,10 @@ public:
     for (size_t i = 0; i < mutexes_.size(); ++i)
       mutexes_[i].reset(new asio::detail::mutex);
     ::CRYPTO_set_locking_callback(&do_init::openssl_locking_func);
-    ::CRYPTO_set_id_callback(&do_init::openssl_id_func);
 #endif // (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
+    ::CRYPTO_set_id_callback(&do_init::openssl_id_func);
+#endif // (OPENSSL_VERSION_NUMBER < 0x10000000L)
 
 namespace asio {
 namespace error {
@@ -62,8 +64,10 @@ public:
 #endif // !defined(SSL_OP_NO_COMPRESSION)
        // && (OPENSSL_VERSION_NUMBER >= 0x00908000L)
 
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
     ::CRYPTO_set_id_callback(0);
+#endif // (OPENSSL_VERSION_NUMBER < 0x10000000L)
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     ::CRYPTO_set_locking_callback(0);
     ::ERR_free_strings();
     ::EVP_cleanup();
@@ -94,38 +98,33 @@ public:
        // && (OPENSSL_VERSION_NUMBER >= 0x00908000L)
 
 private:
+#if (OPENSSL_VERSION_NUMBER < 0x10000000L)
   static unsigned long openssl_id_func()
   {
 #if defined(ASIO_WINDOWS) || defined(__CYGWIN__)
     return ::GetCurrentThreadId();
 #else // defined(ASIO_WINDOWS) || defined(__CYGWIN__)
-    void* id = instance()->thread_id_;
-    if (id == 0)
-      instance()->thread_id_ = id = &id; // Ugh.
+    void* id = &errno;
     ASIO_ASSERT(sizeof(unsigned long) >= sizeof(void*));
     return reinterpret_cast<unsigned long>(id);
 #endif // defined(ASIO_WINDOWS) || defined(__CYGWIN__)
   }
+#endif // (OPENSSL_VERSION_NUMBER < 0x10000000L)
 
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
   static void openssl_locking_func(int mode, int n, 
     const char* /*file*/, int /*line*/)
   {
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     if (mode & CRYPTO_LOCK)
       instance()->mutexes_[n]->lock();
     else
       instance()->mutexes_[n]->unlock();
-#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L)
   }
 
   // Mutexes to be used in locking callbacks.
   std::vector<asio::detail::shared_ptr<
         asio::detail::mutex> > mutexes_;
-
 namespace detail {
-  // The thread identifiers to be used by openssl.
-  asio::detail::tss_ptr<void> thread_id_;
-#endif // !defined(ASIO_WINDOWS) && !defined(__CYGWIN__)
+#endif // (OPENSSL_VERSION_NUMBER < 0x10100000L)
 
 class ssl_category : public asio::error_category
@@ -50,6 +49,38 @@ const asio::error_category& get_ssl_category()
 }
index d9cfc71..eda740d 100644
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/openssl_types.hpp
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/openssl_types.hpp
@@ -21,7 +21,9 @@
 #if !defined(OPENSSL_NO_ENGINE)
 # include <openssl/engine.h>
 #endif // !defined(OPENSSL_NO_ENGINE)
+#include <openssl/dh.h>
 #include <openssl/err.h>
+#include <openssl/rsa.h>
 #include <openssl/x509v3.h>
 #include "asio/detail/socket_types.hpp"
 
 } // namespace error
+namespace ssl {
+namespace error {
+namespace detail {
+
+class stream_category : public asio::error_category
+{
+public:
+  const char* name() const ASIO_ERROR_CATEGORY_NOEXCEPT
+  {
+    return "asio.ssl.stream";
+  }
+
+  std::string message(int value) const
+  {
+    switch (value)
+    {
+    case stream_truncated: return "stream truncated";
+    default: return "asio.ssl.stream error";
+    }
+  }
+};
+
+} // namespace detail
+
+const asio::error_category& get_stream_category()
+{
+  static detail::stream_category instance;
+  return instance;
+}
+
+} // namespace error
+} // namespace ssl
 } // namespace asio
References:
https://www.openssl.org/docs/man1.1.0/ssl/OPENSSL_init_ssl.html
https://www.openssl.org/docs/man1.1.0/crypto/OPENSSL_init_crypto.html
---
 asio/include/asio/ssl/detail/impl/openssl_init.ipp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
index 392eff9..5de0caa 100644
--- src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
+++ src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/detail/impl/openssl_init.ipp
@@ -35,11 +35,11 @@ class openssl_init_base::do_init
 public:
   do_init()
   {
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L)
     ::SSL_library_init();
     ::SSL_load_error_strings();        
     ::OpenSSL_add_all_algorithms();
 
 #include "asio/detail/pop_options.hpp"
     mutexes_.resize(::CRYPTO_num_locks());
     for (size_t i = 0; i < mutexes_.size(); ++i)
       mutexes_[i].reset(new asio::detail::mutex);

Lines 1-9 Link Here

(-)mongodb34.23/files/patch-src_mongo_db_repl_oplog__fetcher.cpp (-2 / +2 lines)
1	https://jira.mongodb.org/browse/SERVER-32516	1	https://jira.mongodb.org/browse/SERVER-32516
2	https://github.com/mongodb/mongo/commit/3c34eda8d8a3	2	https://github.com/mongodb/mongo/commit/3c34eda8d8a3
3		3
4	--- src/mongo/db/repl/oplog_fetcher.cpp.orig 2017-09-07 19:28:48 UTC	4	--- src/mongo/db/repl/oplog_fetcher.cpp.orig 2019-09-04 17:33:32 UTC
5	+++ src/mongo/db/repl/oplog_fetcher.cpp	5	+++ src/mongo/db/repl/oplog_fetcher.cpp
6	@@ -265,7 +265,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> p	6	@@ -282,7 +282,7 @@ StatusWith<boost::optional<rpc::OplogQueryMetadata>> p
7	if (!metadataResult.isOK()) {	7	if (!metadataResult.isOK()) {
8	return metadataResult.getStatus();	8	return metadataResult.getStatus();
9	}	9	}

Lines 1-6 Link Here

(-)mongodb34.23/files/patch-src_mongo_util_net_ssl__manager.cpp (-3 / +3 lines)
1	--- src/mongo/util/net/ssl_manager.cpp.orig 2018-08-29 22:42:21.000000000 +0200	1	--- src/mongo/util/net/ssl_manager.cpp.orig 2019-09-04 17:33:32 UTC
2	+++ src/mongo/util/net/ssl_manager.cpp 2018-12-23 21:05:48.170857000 +0100	2	+++ src/mongo/util/net/ssl_manager.cpp
3	@@ -158,7 +158,7 @@	3	@@ -167,7 +167,7 @@ IMPLEMENT_ASN1_ENCODE_FUNCTIONS_const_fname(ASN1_SEQUE
4	#endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS	4	#endif // MONGO_CONFIG_NEEDS_ASN1_ANY_DEFINITIONS
5	// clang-format on	5	// clang-format on
6		6

Lines 1-6 Link Here

(-)mongodb34.23/files/patch-src_mongo_util_net_ssl__manager.h (-3 / +3 lines)
1	--- src/mongo/util/net/ssl_manager.h.orig 2019-02-04 15:20:46.451365000 +0100	1	--- src/mongo/util/net/ssl_manager.h.orig 2019-09-04 17:33:32 UTC
2	+++ src/mongo/util/net/ssl_manager.h 2019-02-04 15:20:15.688896000 +0100	2	+++ src/mongo/util/net/ssl_manager.h
3	@@ -222,6 +222,7 @@	3	@@ -222,6 +222,7 @@ enum class TLSVersion {
4	kTLS10,	4	kTLS10,
5	kTLS11,	5	kTLS11,
6	kTLS12,	6	kTLS12,

Return to bug 241078

Lines 1-6 Link Here

(-)mongodb34.23/files/patch-SConstruct (-6 / +6 lines)
1	--- SConstruct.orig 2017-06-08 16:11:03 UTC	1	--- SConstruct.orig 2019-09-04 17:33:32 UTC
2	+++ SConstruct	2	+++ SConstruct
3	@@ -929,9 +929,9 @@ if has_option('variables-help'):	3	@@ -936,9 +936,9 @@ if has_option('variables-help'):
4	print env_vars.GenerateHelpText(env)	4	print env_vars.GenerateHelpText(env)
5	Exit(0)	5	Exit(0)
6		6
Lines 13-19 Link Here
13		13
14	def set_config_header_define(env, varname, varval = 1):	14	def set_config_header_define(env, varname, varval = 1):
15	env['CONFIG_HEADER_DEFINES'][varname] = varval	15	env['CONFIG_HEADER_DEFINES'][varname] = varval
16	@@ -1550,7 +1550,7 @@ if env.TargetOSIs('posix'):	16	@@ -1557,7 +1557,7 @@ if env.TargetOSIs('posix'):
17	# If runtime hardening is requested, then build anything	17	# If runtime hardening is requested, then build anything
18	# destined for an executable with the necessary flags for PIE.	18	# destined for an executable with the necessary flags for PIE.
19	env.AppendUnique(	19	env.AppendUnique(
Lines 22-28 Link Here
22	PROGLINKFLAGS=['-pie'],	22	PROGLINKFLAGS=['-pie'],
23	)	23	)
24		24
25	@@ -1564,7 +1564,7 @@ if env.TargetOSIs('posix'):	25	@@ -1571,7 +1571,7 @@ if env.TargetOSIs('posix'):
26	"-Wno-unknown-pragmas",	26	"-Wno-unknown-pragmas",
27	"-Winvalid-pch"] )	27	"-Winvalid-pch"] )
28	# env.Append( " -Wconversion" ) TODO: this doesn't really work yet	28	# env.Append( " -Wconversion" ) TODO: this doesn't really work yet
Lines 31-37 Link Here
31	if not has_option("disable-warnings-as-errors"):	31	if not has_option("disable-warnings-as-errors"):
32	env.Append( CCFLAGS=["-Werror"] )	32	env.Append( CCFLAGS=["-Werror"] )
33		33
34	@@ -1592,19 +1592,19 @@ if env.TargetOSIs('posix'):	34	@@ -1599,19 +1599,19 @@ if env.TargetOSIs('posix'):
35	env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] )	35	env.Append( CCFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
36	env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] )	36	env.Append( LINKFLAGS=["-fprofile-arcs", "-ftest-coverage"] )
37		37
Lines 61-67 Link Here
61		61
62	mmapv1 = False	62	mmapv1 = False
63	if get_option('mmapv1') == 'auto':	63	if get_option('mmapv1') == 'auto':
64	@@ -2461,7 +2461,7 @@ def doConfigure(myenv):	64	@@ -2468,7 +2468,7 @@ def doConfigure(myenv):
65	}}	65	}}
66	""".format(storage_class)	66	""".format(storage_class)
67	context.Message('Checking for storage class {0} '.format(storage_class))	67	context.Message('Checking for storage class {0} '.format(storage_class))