diff --git a/include/boost/asio/ssl/detail/engine.hpp b/include/boost/asio/ssl/detail/engine.hpp index 8b24a96..8250e47 100644 --- a/include/boost/asio/ssl/detail/engine.hpp +++ b/include/boost/asio/ssl/detail/engine.hpp @@ -19,7 +19,6 @@ #if !defined(BOOST_ASIO_ENABLE_OLD_SSL) # include -# include # include # include # include @@ -120,10 +119,6 @@ private: BOOST_ASIO_DECL static int verify_callback_function( int preverified, X509_STORE_CTX* ctx); - // The SSL_accept function may not be thread safe. This mutex is used to - // protect all calls to the SSL_accept function. - BOOST_ASIO_DECL static boost::asio::detail::static_mutex& accept_mutex(); - // Perform one operation. Returns >= 0 on success or error, want_read if the // operation needs more input, or want_write if it needs to write some output // before the operation can complete. diff --git a/include/boost/asio/ssl/detail/impl/engine.ipp b/include/boost/asio/ssl/detail/impl/engine.ipp index 5aa9b5a..264c518 100644 --- a/include/boost/asio/ssl/detail/impl/engine.ipp +++ b/include/boost/asio/ssl/detail/impl/engine.ipp @@ -45,8 +45,6 @@ engine::engine(SSL_CTX* context) boost::asio::detail::throw_error(ec, "engine"); } - accept_mutex().init(); - ::SSL_set_mode(ssl_, SSL_MODE_ENABLE_PARTIAL_WRITE); ::SSL_set_mode(ssl_, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER); #if defined(SSL_MODE_RELEASE_BUFFERS) @@ -225,12 +223,6 @@ const boost::system::error_code& engine::map_error_code( return ec; } -boost::asio::detail::static_mutex& engine::accept_mutex() -{ - static boost::asio::detail::static_mutex mutex = BOOST_ASIO_STATIC_MUTEX_INIT; - return mutex; -} - engine::want engine::perform(int (engine::* op)(void*, std::size_t), void* data, std::size_t length, boost::system::error_code& ec, std::size_t* bytes_transferred) @@ -287,7 +279,6 @@ engine::want engine::perform(int (engine::* op)(void*, std::size_t), int engine::do_accept(void*, std::size_t) { - boost::asio::detail::static_mutex::scoped_lock lock(accept_mutex()); return ::SSL_accept(ssl_); }