passenger 5.3.3 → 5.3.4

data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/stream_core.hpp

@@ -2,7 +2,7 @@
 // ssl/detail/stream_core.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,15 +17,13 @@
 
 #include <boost/asio/detail/config.hpp>
 
-#if !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-# if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-#  include <boost/asio/deadline_timer.hpp>
-# else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-#  include <boost/asio/steady_timer.hpp>
-# endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
-# include <boost/asio/ssl/detail/engine.hpp>
-# include <boost/asio/buffer.hpp>
-#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL)
+#if defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
+# include <boost/asio/deadline_timer.hpp>
+#else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
+# include <boost/asio/steady_timer.hpp>
+#endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
+#include <boost/asio/ssl/detail/engine.hpp>
+#include <boost/asio/buffer.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -34,18 +32,16 @@ namespace asio {
 namespace ssl {
 namespace detail {
 
-#if !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-
 struct stream_core
 {
   // According to the OpenSSL documentation, this is the buffer size that is
   // sufficient to hold the largest possible TLS record.
   enum { max_tls_record_size = 17 * 1024 };
 
-  stream_core(SSL_CTX* context, boost::asio::io_service& io_service)
+  stream_core(SSL_CTX* context, boost::asio::io_context& io_context)
     : engine_(context),
-      pending_read_(io_service),
-      pending_write_(io_service),
+      pending_read_(io_context),
+      pending_write_(io_context),
       output_buffer_space_(max_tls_record_size),
       output_buffer_(boost::asio::buffer(output_buffer_space_)),
       input_buffer_space_(max_tls_record_size),
@@ -80,6 +76,13 @@ struct stream_core
   {
     return boost::posix_time::pos_infin;
   }
+
+  // Helper function to get a timer's expiry time.
+  static boost::asio::deadline_timer::time_type expiry(
+      const boost::asio::deadline_timer& timer)
+  {
+    return timer.expires_at();
+  }
 #else // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
   // Timer used for storing queued read operations.
   boost::asio::steady_timer pending_read_;
@@ -98,26 +101,31 @@ struct stream_core
   {
     return (boost::asio::steady_timer::time_point::max)();
   }
+
+  // Helper function to get a timer's expiry time.
+  static boost::asio::steady_timer::time_point expiry(
+      const boost::asio::steady_timer& timer)
+  {
+    return timer.expiry();
+  }
 #endif // defined(BOOST_ASIO_HAS_BOOST_DATE_TIME)
 
   // Buffer space used to prepare output intended for the transport.
   std::vector<unsigned char> output_buffer_space_;
 
   // A buffer that may be used to prepare output intended for the transport.
-  const boost::asio::mutable_buffers_1 output_buffer_;
+  const boost::asio::mutable_buffer output_buffer_;
 
   // Buffer space used to read input intended for the engine.
   std::vector<unsigned char> input_buffer_space_;
 
   // A buffer that may be used to read input intended for the engine.
-  const boost::asio::mutable_buffers_1 input_buffer_;
+  const boost::asio::mutable_buffer input_buffer_;
 
   // The buffer pointing to the engine's unconsumed input.
   boost::asio::const_buffer input_;
 };
 
-#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-
 } // namespace detail
 } // namespace ssl
 } // namespace asio

data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/verify_callback.hpp

@@ -2,7 +2,7 @@
 // ssl/detail/verify_callback.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,9 +17,7 @@
 
 #include <boost/asio/detail/config.hpp>
 
-#if !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-# include <boost/asio/ssl/verify_context.hpp>
-#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL)
+#include <boost/asio/ssl/verify_context.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -28,8 +26,6 @@ namespace asio {
 namespace ssl {
 namespace detail {
 
-#if !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-
 class verify_callback_base
 {
 public:
@@ -58,8 +54,6 @@ private:
   VerifyCallback callback_;
 };
 
-#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-
 } // namespace detail
 } // namespace ssl
 } // namespace asio

data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/detail/write_op.hpp

@@ -2,7 +2,7 @@
 // ssl/detail/write_op.hpp
 // ~~~~~~~~~~~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -17,10 +17,8 @@
 
 #include <boost/asio/detail/config.hpp>
 
-#if !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-# include <boost/asio/detail/buffer_sequence_adapter.hpp>
-# include <boost/asio/ssl/detail/engine.hpp>
-#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL)
+#include <boost/asio/detail/buffer_sequence_adapter.hpp>
+#include <boost/asio/ssl/detail/engine.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -29,8 +27,6 @@ namespace asio {
 namespace ssl {
 namespace detail {
 
-#if !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-
 template <typename ConstBufferSequence>
 class write_op
 {
@@ -63,8 +59,6 @@ private:
   ConstBufferSequence buffers_;
 };
 
-#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-
 } // namespace detail
 } // namespace ssl
 } // namespace asio

data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/error.hpp

@@ -2,7 +2,7 @@
 // ssl/error.hpp
 // ~~~~~~~~~~~~~
 //
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2003-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)

data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/impl/context.hpp

@@ -3,7 +3,7 @@
 // ~~~~~~~~~~~~~~~~~~~~
 //
 // Copyright (c) 2005 Voipster / Indrek dot Juhani at voipster dot com
-// Copyright (c) 2005-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2005-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,9 +18,7 @@
 
 #include <boost/asio/detail/config.hpp>
 
-#if !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-# include <boost/asio/detail/throw_error.hpp>
-#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL)
+#include <boost/asio/detail/throw_error.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -28,8 +26,6 @@ namespace boost {
 namespace asio {
 namespace ssl {
 
-#if !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-
 template <typename VerifyCallback>
 void context::set_verify_callback(VerifyCallback callback)
 {
@@ -39,11 +35,12 @@ void context::set_verify_callback(VerifyCallback callback)
 }
 
 template <typename VerifyCallback>
-boost::system::error_code context::set_verify_callback(
+BOOST_ASIO_SYNC_OP_VOID context::set_verify_callback(
     VerifyCallback callback, boost::system::error_code& ec)
 {
-  return do_set_verify_callback(
+  do_set_verify_callback(
       new detail::verify_callback<VerifyCallback>(callback), ec);
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 template <typename PasswordCallback>
@@ -55,15 +52,14 @@ void context::set_password_callback(PasswordCallback callback)
 }
 
 template <typename PasswordCallback>
-boost::system::error_code context::set_password_callback(
+BOOST_ASIO_SYNC_OP_VOID context::set_password_callback(
     PasswordCallback callback, boost::system::error_code& ec)
 {
-  return do_set_password_callback(
+  do_set_password_callback(
       new detail::password_callback<PasswordCallback>(callback), ec);
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
-#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-
 } // namespace ssl
 } // namespace asio
 } // namespace boost

data/src/cxx_supportlib/vendor-modified/boost/asio/ssl/impl/context.ipp

@@ -3,7 +3,7 @@
 // ~~~~~~~~~~~~~~~~~~~~
 //
 // Copyright (c) 2005 Voipster / Indrek dot Juhani at voipster dot com
-// Copyright (c) 2005-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
+// Copyright (c) 2005-2018 Christopher M. Kohlhoff (chris at kohlhoff dot com)
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
@@ -18,13 +18,11 @@
 
 #include <boost/asio/detail/config.hpp>
 
-#if !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-# include <cstring>
-# include <boost/asio/detail/throw_error.hpp>
-# include <boost/asio/error.hpp>
-# include <boost/asio/ssl/context.hpp>
-# include <boost/asio/ssl/error.hpp>
-#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL)
+#include <cstring>
+#include <boost/asio/detail/throw_error.hpp>
+#include <boost/asio/error.hpp>
+#include <boost/asio/ssl/context.hpp>
+#include <boost/asio/ssl/error.hpp>
 
 #include <boost/asio/detail/push_options.hpp>
 
@@ -32,8 +30,6 @@ namespace boost {
 namespace asio {
 namespace ssl {
 
-#if !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-
 struct context::bio_cleanup
 {
   BIO* p;
@@ -326,14 +322,6 @@ context::context(context::method m)
   set_options(no_compression);
 }
 
-context::context(boost::asio::io_service&, context::method m)
-  : handle_(0)
-{
-  context tmp(m);
-  handle_ = tmp.handle_;
-  tmp.handle_ = 0;
-}
-
 #if defined(BOOST_ASIO_HAS_MOVE) || defined(GENERATING_DOCUMENTATION)
 context::context(context&& other)
 {
@@ -390,11 +378,6 @@ context::native_handle_type context::native_handle()
   return handle_;
 }
 
-context::impl_type context::impl()
-{
-  return handle_;
-}
-
 void context::clear_options(context::options o)
 {
   boost::system::error_code ec;
@@ -402,7 +385,7 @@ void context::clear_options(context::options o)
   boost::asio::detail::throw_error(ec, "clear_options");
 }
 
-boost::system::error_code context::clear_options(
+BOOST_ASIO_SYNC_OP_VOID context::clear_options(
     context::options o, boost::system::error_code& ec)
 {
 #if (OPENSSL_VERSION_NUMBER >= 0x009080DFL) \
@@ -426,7 +409,7 @@ boost::system::error_code context::clear_options(
   ec = boost::asio::error::operation_not_supported;
 #endif // (OPENSSL_VERSION_NUMBER >= 0x009080DFL)
        //   && (OPENSSL_VERSION_NUMBER != 0x00909000L)
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::set_options(context::options o)
@@ -436,7 +419,7 @@ void context::set_options(context::options o)
   boost::asio::detail::throw_error(ec, "set_options");
 }
 
-boost::system::error_code context::set_options(
+BOOST_ASIO_SYNC_OP_VOID context::set_options(
     context::options o, boost::system::error_code& ec)
 {
 #if !defined(SSL_OP_NO_COMPRESSION)
@@ -453,7 +436,7 @@ boost::system::error_code context::set_options(
   ::SSL_CTX_set_options(handle_, o);
 
   ec = boost::system::error_code();
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::set_verify_mode(verify_mode v)
@@ -463,13 +446,13 @@ void context::set_verify_mode(verify_mode v)
   boost::asio::detail::throw_error(ec, "set_verify_mode");
 }
 
-boost::system::error_code context::set_verify_mode(
+BOOST_ASIO_SYNC_OP_VOID context::set_verify_mode(
     verify_mode v, boost::system::error_code& ec)
 {
   ::SSL_CTX_set_verify(handle_, v, ::SSL_CTX_get_verify_callback(handle_));
 
   ec = boost::system::error_code();
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::set_verify_depth(int depth)
@@ -479,13 +462,13 @@ void context::set_verify_depth(int depth)
   boost::asio::detail::throw_error(ec, "set_verify_depth");
 }
 
-boost::system::error_code context::set_verify_depth(
+BOOST_ASIO_SYNC_OP_VOID context::set_verify_depth(
     int depth, boost::system::error_code& ec)
 {
   ::SSL_CTX_set_verify_depth(handle_, depth);
 
   ec = boost::system::error_code();
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::load_verify_file(const std::string& filename)
@@ -495,7 +478,7 @@ void context::load_verify_file(const std::string& filename)
   boost::asio::detail::throw_error(ec, "load_verify_file");
 }
 
-boost::system::error_code context::load_verify_file(
+BOOST_ASIO_SYNC_OP_VOID context::load_verify_file(
     const std::string& filename, boost::system::error_code& ec)
 {
   ::ERR_clear_error();
@@ -505,11 +488,11 @@ boost::system::error_code context::load_verify_file(
     ec = boost::system::error_code(
         static_cast<int>(::ERR_get_error()),
         boost::asio::error::get_ssl_category());
-    return ec;
+    BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
   }
 
   ec = boost::system::error_code();
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::add_certificate_authority(const const_buffer& ca)
@@ -519,7 +502,7 @@ void context::add_certificate_authority(const const_buffer& ca)
   boost::asio::detail::throw_error(ec, "add_certificate_authority");
 }
 
-boost::system::error_code context::add_certificate_authority(
+BOOST_ASIO_SYNC_OP_VOID context::add_certificate_authority(
     const const_buffer& ca, boost::system::error_code& ec)
 {
   ::ERR_clear_error();
@@ -527,24 +510,27 @@ boost::system::error_code context::add_certificate_authority(
   bio_cleanup bio = { make_buffer_bio(ca) };
   if (bio.p)
   {
-    x509_cleanup cert = { ::PEM_read_bio_X509(bio.p, 0, 0, 0) };
-    if (cert.p)
+    if (X509_STORE* store = ::SSL_CTX_get_cert_store(handle_))
     {
-      if (X509_STORE* store = ::SSL_CTX_get_cert_store(handle_))
+      for (;;)
       {
-        if (::X509_STORE_add_cert(store, cert.p) == 1)
+        x509_cleanup cert = { ::PEM_read_bio_X509(bio.p, 0, 0, 0) };
+        if (!cert.p)
+          break;
+
+        if (::X509_STORE_add_cert(store, cert.p) != 1)
         {
-          ec = boost::system::error_code();
-          return ec;
+          ec = boost::system::error_code(
+              static_cast<int>(::ERR_get_error()),
+              boost::asio::error::get_ssl_category());
+          BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
         }
       }
     }
   }
 
-  ec = boost::system::error_code(
-      static_cast<int>(::ERR_get_error()),
-      boost::asio::error::get_ssl_category());
-  return ec;
+  ec = boost::system::error_code();
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::set_default_verify_paths()
@@ -554,7 +540,7 @@ void context::set_default_verify_paths()
   boost::asio::detail::throw_error(ec, "set_default_verify_paths");
 }
 
-boost::system::error_code context::set_default_verify_paths(
+BOOST_ASIO_SYNC_OP_VOID context::set_default_verify_paths(
     boost::system::error_code& ec)
 {
   ::ERR_clear_error();
@@ -564,11 +550,11 @@ boost::system::error_code context::set_default_verify_paths(
     ec = boost::system::error_code(
         static_cast<int>(::ERR_get_error()),
         boost::asio::error::get_ssl_category());
-    return ec;
+    BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
   }
 
   ec = boost::system::error_code();
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::add_verify_path(const std::string& path)
@@ -578,7 +564,7 @@ void context::add_verify_path(const std::string& path)
   boost::asio::detail::throw_error(ec, "add_verify_path");
 }
 
-boost::system::error_code context::add_verify_path(
+BOOST_ASIO_SYNC_OP_VOID context::add_verify_path(
     const std::string& path, boost::system::error_code& ec)
 {
   ::ERR_clear_error();
@@ -588,11 +574,11 @@ boost::system::error_code context::add_verify_path(
     ec = boost::system::error_code(
         static_cast<int>(::ERR_get_error()),
         boost::asio::error::get_ssl_category());
-    return ec;
+    BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
   }
 
   ec = boost::system::error_code();
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::use_certificate(
@@ -603,7 +589,7 @@ void context::use_certificate(
   boost::asio::detail::throw_error(ec, "use_certificate");
 }
 
-boost::system::error_code context::use_certificate(
+BOOST_ASIO_SYNC_OP_VOID context::use_certificate(
     const const_buffer& certificate, file_format format,
     boost::system::error_code& ec)
 {
@@ -612,11 +598,11 @@ boost::system::error_code context::use_certificate(
   if (format == context_base::asn1)
   {
     if (::SSL_CTX_use_certificate_ASN1(handle_,
-          static_cast<int>(buffer_size(certificate)),
-          buffer_cast<const unsigned char*>(certificate)) == 1)
+          static_cast<int>(certificate.size()),
+          static_cast<const unsigned char*>(certificate.data())) == 1)
     {
       ec = boost::system::error_code();
-      return ec;
+      BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
     }
   }
   else if (format == context_base::pem)
@@ -630,7 +616,7 @@ boost::system::error_code context::use_certificate(
         if (::SSL_CTX_use_certificate(handle_, cert.p) == 1)
         {
           ec = boost::system::error_code();
-          return ec;
+          BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
         }
       }
     }
@@ -638,13 +624,13 @@ boost::system::error_code context::use_certificate(
   else
   {
     ec = boost::asio::error::invalid_argument;
-    return ec;
+    BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
   }
 
   ec = boost::system::error_code(
       static_cast<int>(::ERR_get_error()),
       boost::asio::error::get_ssl_category());
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::use_certificate_file(
@@ -655,7 +641,7 @@ void context::use_certificate_file(
   boost::asio::detail::throw_error(ec, "use_certificate_file");
 }
 
-boost::system::error_code context::use_certificate_file(
+BOOST_ASIO_SYNC_OP_VOID context::use_certificate_file(
     const std::string& filename, file_format format,
     boost::system::error_code& ec)
 {
@@ -671,7 +657,7 @@ boost::system::error_code context::use_certificate_file(
   default:
     {
       ec = boost::asio::error::invalid_argument;
-      return ec;
+      BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
     }
   }
 
@@ -682,11 +668,11 @@ boost::system::error_code context::use_certificate_file(
     ec = boost::system::error_code(
         static_cast<int>(::ERR_get_error()),
         boost::asio::error::get_ssl_category());
-    return ec;
+    BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
   }
 
   ec = boost::system::error_code();
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::use_certificate_chain(const const_buffer& chain)
@@ -696,7 +682,7 @@ void context::use_certificate_chain(const const_buffer& chain)
   boost::asio::detail::throw_error(ec, "use_certificate_chain");
 }
 
-boost::system::error_code context::use_certificate_chain(
+BOOST_ASIO_SYNC_OP_VOID context::use_certificate_chain(
     const const_buffer& chain, boost::system::error_code& ec)
 {
   ::ERR_clear_error();
@@ -719,7 +705,7 @@ boost::system::error_code context::use_certificate_chain(
     {
       ec = boost::system::error_code(ERR_R_PEM_LIB,
           boost::asio::error::get_ssl_category());
-      return ec;
+      BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
     }
 
     int result = ::SSL_CTX_use_certificate(handle_, cert.p);
@@ -728,7 +714,7 @@ boost::system::error_code context::use_certificate_chain(
       ec = boost::system::error_code(
           static_cast<int>(::ERR_get_error()),
           boost::asio::error::get_ssl_category());
-      return ec;
+      BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
     }
 
 #if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER)
@@ -750,7 +736,7 @@ boost::system::error_code context::use_certificate_chain(
         ec = boost::system::error_code(
             static_cast<int>(::ERR_get_error()),
             boost::asio::error::get_ssl_category());
-        return ec;
+        BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
       }
     }
   
@@ -760,14 +746,14 @@ boost::system::error_code context::use_certificate_chain(
     {
       ::ERR_clear_error();
       ec = boost::system::error_code();
-      return ec;
+      BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
     }
   }
 
   ec = boost::system::error_code(
       static_cast<int>(::ERR_get_error()),
       boost::asio::error::get_ssl_category());
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::use_certificate_chain_file(const std::string& filename)
@@ -777,7 +763,7 @@ void context::use_certificate_chain_file(const std::string& filename)
   boost::asio::detail::throw_error(ec, "use_certificate_chain_file");
 }
 
-boost::system::error_code context::use_certificate_chain_file(
+BOOST_ASIO_SYNC_OP_VOID context::use_certificate_chain_file(
     const std::string& filename, boost::system::error_code& ec)
 {
   ::ERR_clear_error();
@@ -787,11 +773,11 @@ boost::system::error_code context::use_certificate_chain_file(
     ec = boost::system::error_code(
         static_cast<int>(::ERR_get_error()),
         boost::asio::error::get_ssl_category());
-    return ec;
+    BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
   }
 
   ec = boost::system::error_code();
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::use_private_key(
@@ -802,7 +788,7 @@ void context::use_private_key(
   boost::asio::detail::throw_error(ec, "use_private_key");
 }
 
-boost::system::error_code context::use_private_key(
+BOOST_ASIO_SYNC_OP_VOID context::use_private_key(
     const const_buffer& private_key, context::file_format format,
     boost::system::error_code& ec)
 {
@@ -833,7 +819,7 @@ boost::system::error_code context::use_private_key(
     default:
       {
         ec = boost::asio::error::invalid_argument;
-        return ec;
+        BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
       }
     }
 
@@ -842,7 +828,7 @@ boost::system::error_code context::use_private_key(
       if (::SSL_CTX_use_PrivateKey(handle_, evp_private_key.p) == 1)
       {
         ec = boost::system::error_code();
-        return ec;
+        BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
       }
     }
   }
@@ -850,7 +836,7 @@ boost::system::error_code context::use_private_key(
   ec = boost::system::error_code(
       static_cast<int>(::ERR_get_error()),
       boost::asio::error::get_ssl_category());
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::use_private_key_file(
@@ -869,7 +855,7 @@ void context::use_rsa_private_key(
   boost::asio::detail::throw_error(ec, "use_rsa_private_key");
 }
 
-boost::system::error_code context::use_rsa_private_key(
+BOOST_ASIO_SYNC_OP_VOID context::use_rsa_private_key(
     const const_buffer& private_key, context::file_format format,
     boost::system::error_code& ec)
 {
@@ -900,7 +886,7 @@ boost::system::error_code context::use_rsa_private_key(
     default:
       {
         ec = boost::asio::error::invalid_argument;
-        return ec;
+        BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
       }
     }
 
@@ -909,7 +895,7 @@ boost::system::error_code context::use_rsa_private_key(
       if (::SSL_CTX_use_RSAPrivateKey(handle_, rsa_private_key.p) == 1)
       {
         ec = boost::system::error_code();
-        return ec;
+        BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
       }
     }
   }
@@ -917,10 +903,10 @@ boost::system::error_code context::use_rsa_private_key(
   ec = boost::system::error_code(
       static_cast<int>(::ERR_get_error()),
       boost::asio::error::get_ssl_category());
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
-boost::system::error_code context::use_private_key_file(
+BOOST_ASIO_SYNC_OP_VOID context::use_private_key_file(
     const std::string& filename, context::file_format format,
     boost::system::error_code& ec)
 {
@@ -936,7 +922,7 @@ boost::system::error_code context::use_private_key_file(
   default:
     {
       ec = boost::asio::error::invalid_argument;
-      return ec;
+      BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
     }
   }
 
@@ -947,11 +933,11 @@ boost::system::error_code context::use_private_key_file(
     ec = boost::system::error_code(
         static_cast<int>(::ERR_get_error()),
         boost::asio::error::get_ssl_category());
-    return ec;
+    BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
   }
 
   ec = boost::system::error_code();
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::use_rsa_private_key_file(
@@ -962,7 +948,7 @@ void context::use_rsa_private_key_file(
   boost::asio::detail::throw_error(ec, "use_rsa_private_key_file");
 }
 
-boost::system::error_code context::use_rsa_private_key_file(
+BOOST_ASIO_SYNC_OP_VOID context::use_rsa_private_key_file(
     const std::string& filename, context::file_format format,
     boost::system::error_code& ec)
 {
@@ -978,7 +964,7 @@ boost::system::error_code context::use_rsa_private_key_file(
   default:
     {
       ec = boost::asio::error::invalid_argument;
-      return ec;
+      BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
     }
   }
 
@@ -990,11 +976,11 @@ boost::system::error_code context::use_rsa_private_key_file(
     ec = boost::system::error_code(
         static_cast<int>(::ERR_get_error()),
         boost::asio::error::get_ssl_category());
-    return ec;
+    BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
   }
 
   ec = boost::system::error_code();
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::use_tmp_dh(const const_buffer& dh)
@@ -1004,7 +990,7 @@ void context::use_tmp_dh(const const_buffer& dh)
   boost::asio::detail::throw_error(ec, "use_tmp_dh");
 }
 
-boost::system::error_code context::use_tmp_dh(
+BOOST_ASIO_SYNC_OP_VOID context::use_tmp_dh(
     const const_buffer& dh, boost::system::error_code& ec)
 {
   ::ERR_clear_error();
@@ -1018,7 +1004,7 @@ boost::system::error_code context::use_tmp_dh(
   ec = boost::system::error_code(
       static_cast<int>(::ERR_get_error()),
       boost::asio::error::get_ssl_category());
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 void context::use_tmp_dh_file(const std::string& filename)
@@ -1028,7 +1014,7 @@ void context::use_tmp_dh_file(const std::string& filename)
   boost::asio::detail::throw_error(ec, "use_tmp_dh_file");
 }
 
-boost::system::error_code context::use_tmp_dh_file(
+BOOST_ASIO_SYNC_OP_VOID context::use_tmp_dh_file(
     const std::string& filename, boost::system::error_code& ec)
 {
   ::ERR_clear_error();
@@ -1042,10 +1028,10 @@ boost::system::error_code context::use_tmp_dh_file(
   ec = boost::system::error_code(
       static_cast<int>(::ERR_get_error()),
       boost::asio::error::get_ssl_category());
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
-boost::system::error_code context::do_use_tmp_dh(
+BOOST_ASIO_SYNC_OP_VOID context::do_use_tmp_dh(
     BIO* bio, boost::system::error_code& ec)
 {
   ::ERR_clear_error();
@@ -1056,17 +1042,17 @@ boost::system::error_code context::do_use_tmp_dh(
     if (::SSL_CTX_set_tmp_dh(handle_, dh.p) == 1)
     {
       ec = boost::system::error_code();
-      return ec;
+      BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
     }
   }
 
   ec = boost::system::error_code(
       static_cast<int>(::ERR_get_error()),
       boost::asio::error::get_ssl_category());
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
-boost::system::error_code context::do_set_verify_callback(
+BOOST_ASIO_SYNC_OP_VOID context::do_set_verify_callback(
     detail::verify_callback_base* callback, boost::system::error_code& ec)
 {
   if (SSL_CTX_get_app_data(handle_))
@@ -1082,7 +1068,7 @@ boost::system::error_code context::do_set_verify_callback(
       &context::verify_callback_function);
 
   ec = boost::system::error_code();
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 int context::verify_callback_function(int preverified, X509_STORE_CTX* ctx)
@@ -1111,7 +1097,7 @@ int context::verify_callback_function(int preverified, X509_STORE_CTX* ctx)
   return 0;
 }
 
-boost::system::error_code context::do_set_password_callback(
+BOOST_ASIO_SYNC_OP_VOID context::do_set_password_callback(
     detail::password_callback_base* callback, boost::system::error_code& ec)
 {
 #if (OPENSSL_VERSION_NUMBER >= 0x10100000L) && !defined(LIBRESSL_VERSION_NUMBER)
@@ -1129,7 +1115,7 @@ boost::system::error_code context::do_set_password_callback(
   SSL_CTX_set_default_passwd_cb(handle_, &context::password_callback_function);
 
   ec = boost::system::error_code();
-  return ec;
+  BOOST_ASIO_SYNC_OP_VOID_RETURN(ec);
 }
 
 int context::password_callback_function(
@@ -1162,12 +1148,10 @@ int context::password_callback_function(
 BIO* context::make_buffer_bio(const const_buffer& b)
 {
   return ::BIO_new_mem_buf(
-      const_cast<void*>(buffer_cast<const void*>(b)),
-      static_cast<int>(buffer_size(b)));
+      const_cast<void*>(b.data()),
+      static_cast<int>(b.size()));
 }
 
-#endif // !defined(BOOST_ASIO_ENABLE_OLD_SSL)
-
 } // namespace ssl
 } // namespace asio
 } // namespace boost