From f8b3ae118654b53ebcfabc114b69e376ba827892 Mon Sep 17 00:00:00 2001 From: Brett Robinson Date: Sun, 25 Nov 2018 03:21:49 -0700 Subject: [PATCH] Update ssl_stream signatures for networking changes fix #1247, close #1323 --- CHANGELOG.md | 6 +++++ .../beast/_experimental/core/ssl_stream.hpp | 24 +++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b536b8ce..f839bbb7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +Version 193: + +* Update ssl_stream signatures for networking changes + +-------------------------------------------------------------------------------- + Version 192: * Use mp11::integer_sequence diff --git a/include/boost/beast/_experimental/core/ssl_stream.hpp b/include/boost/beast/_experimental/core/ssl_stream.hpp index f4b5c9ff..311f3e29 100644 --- a/include/boost/beast/_experimental/core/ssl_stream.hpp +++ b/include/boost/beast/_experimental/core/ssl_stream.hpp @@ -259,11 +259,11 @@ public: @note Calls @c SSL_set_verify. */ - boost::system::error_code + void set_verify_mode(boost::asio::ssl::verify_mode v, boost::system::error_code& ec) { - return p_->next_layer().set_verify_mode(v, ec); + p_->next_layer().set_verify_mode(v, ec); } /** Set the peer verification depth. @@ -296,11 +296,11 @@ public: @note Calls @c SSL_set_verify_depth. */ - boost::system::error_code + void set_verify_depth( int depth, boost::system::error_code& ec) { - return p_->next_layer().set_verify_depth(depth, ec); + p_->next_layer().set_verify_depth(depth, ec); } /** Set the callback used to verify peer certificates. @@ -347,11 +347,11 @@ public: @note Calls @c SSL_set_verify. */ template - boost::system::error_code + void set_verify_callback(VerifyCallback callback, boost::system::error_code& ec) { - return p_->next_layer().set_verify_callback(callback, ec); + p_->next_layer().set_verify_callback(callback, ec); } /** Perform SSL handshaking. @@ -380,11 +380,11 @@ public: @param ec Set to indicate what error occurred, if any. */ - boost::system::error_code + void handshake(handshake_type type, boost::system::error_code& ec) { - return p_->next_layer().handshake(type, ec); + p_->next_layer().handshake(type, ec); } /** Perform SSL handshaking. @@ -420,12 +420,12 @@ public: @param ec Set to indicate what error occurred, if any. */ template - boost::system::error_code + void handshake(handshake_type type, ConstBufferSequence const& buffers, boost::system::error_code& ec) { - return p_->next_layer().handshake(type, buffers, ec); + p_->next_layer().handshake(type, buffers, ec); } /** Start an asynchronous SSL handshake. @@ -504,10 +504,10 @@ public: @param ec Set to indicate what error occurred, if any. */ - boost::system::error_code + void shutdown(boost::system::error_code& ec) { - return p_->next_layer().shutdown(ec); + p_->next_layer().shutdown(ec); } /** Asynchronously shut down SSL on the stream.