Revert "SERVER-19221 patch ASIO to not initialize OpenSSL"

This reverts commit 3b08961d77a2a7b3a8a99594565dd60ea889877f.

3 files changed, 4 insertions, 11 deletions

diff --git a/src/mongo/db/db.cpp b/src/mongo/db/db.cpp
index f0d95373b04..2b4ab0e3f26 100644
--- a/src/mongo/db/db.cpp
+++ b/src/mongo/db/db.cpp
@@ -731,12 +731,7 @@ static void startupConfigActions(const std::vector<std::string>& args) {
 #endif
 }
 
-MONGO_INITIALIZER_WITH_PREREQUISITES(CreateReplicationManager,
-#if MONGO_CONFIG_SSL
-                                     ("SetGlobalEnvironment", "SSLManager"))
-#else
-                                     ("SetGlobalEnvironment"))
-#endif
+MONGO_INITIALIZER_WITH_PREREQUISITES(CreateReplicationManager, ("SetGlobalEnvironment"))
 (InitializerContext* context) {
     auto replCoord = stdx::make_unique<repl::ReplicationCoordinatorImpl>(
         getGlobalReplSettings(),
diff --git a/src/mongo/executor/network_interface_asio_connect.cpp b/src/mongo/executor/network_interface_asio_connect.cpp
index 2ac64ddcf43..f50840bf3da 100644
--- a/src/mongo/executor/network_interface_asio_connect.cpp
+++ b/src/mongo/executor/network_interface_asio_connect.cpp
@@ -56,13 +56,13 @@ NetworkInterfaceASIO::AsyncConnection::AsyncConnection(
 
 #if defined(_MSC_VER) && _MSC_VER < 1900
 NetworkInterfaceASIO::AsyncConnection::AsyncConnection(AsyncConnection&& other)
-    : _stream(std::move(other._stream)),
+    : _sock(std::move(other._sock)),
       _serverProtocols(other._serverProtocols),
       _clientProtocols(other._clientProtocols) {}
 
 NetworkInterfaceASIO::AsyncConnection& NetworkInterfaceASIO::AsyncConnection::operator=(
     AsyncConnection&& other) {
-    _stream = std::move(other._stream);
+    _sock = std::move(other._sock);
     _serverProtocols = other._serverProtocols;
     _clientProtocols = other._clientProtocols;
     return *this;
diff --git a/src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/context.hpp b/src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/context.hpp
index d7a9e1cdca5..2bf2e0aa800 100644
--- a/src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/context.hpp
+++ b/src/third_party/asio-asio-1-11-0/asio/include/asio/ssl/context.hpp
@@ -741,10 +741,8 @@ private:
   // The underlying native implementation.
   native_handle_type handle_;
 
-  // MONGO HACK - prevent ASIO from initializing OpenSSL
   // Ensure openssl is initialised.
-  // asio::ssl::detail::openssl_init<> init_;
-
+  asio::ssl::detail::openssl_init<> init_;
 };
 
 } // namespace ssl