boostorg/beast
1
0
Fork 1
mirror of https://github.com/boostorg/beast.git synced 2025-07-30 12:57:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update ssl_stream signatures for networking changes

Browse Source 
fix #1247, close #1323
This commit is contained in:
Brett Robinson
2018-11-25 03:21:49 -07:00
committed by Vinnie Falco
parent e57c74b56c
commit f8b3ae1186
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@ -1,3 +1,9 @@
Version 193:
* Update ssl_stream signatures for networking changes
--------------------------------------------------------------------------------
Version 192: Version 192:
* Use mp11::integer_sequence * Use mp11::integer_sequence

24
include/boost/beast/_experimental/core/ssl_stream.hpp
View File

@ -259,11 +259,11 @@ public:
@note Calls @c SSL_set_verify. @note Calls @c SSL_set_verify.
*/ */
boost::system::error_code void
set_verify_mode(boost::asio::ssl::verify_mode v, set_verify_mode(boost::asio::ssl::verify_mode v,
boost::system::error_code& ec) 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. /** Set the peer verification depth.
@ -296,11 +296,11 @@ public:
@note Calls @c SSL_set_verify_depth. @note Calls @c SSL_set_verify_depth.
*/ */
boost::system::error_code void
set_verify_depth( set_verify_depth(
int depth, boost::system::error_code& ec) 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. /** Set the callback used to verify peer certificates.
@ -347,11 +347,11 @@ public:
@note Calls @c SSL_set_verify. @note Calls @c SSL_set_verify.
*/ */
template<class VerifyCallback> template<class VerifyCallback>
boost::system::error_code void
set_verify_callback(VerifyCallback callback, set_verify_callback(VerifyCallback callback,
boost::system::error_code& ec) 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. /** Perform SSL handshaking.
@ -380,11 +380,11 @@ public:
@param ec Set to indicate what error occurred, if any. @param ec Set to indicate what error occurred, if any.
*/ */
boost::system::error_code void
handshake(handshake_type type, handshake(handshake_type type,
boost::system::error_code& ec) boost::system::error_code& ec)
{ {
return p_->next_layer().handshake(type, ec); p_->next_layer().handshake(type, ec);
} }
/** Perform SSL handshaking. /** Perform SSL handshaking.
@ -420,12 +420,12 @@ public:
@param ec Set to indicate what error occurred, if any. @param ec Set to indicate what error occurred, if any.
*/ */
template<class ConstBufferSequence> template<class ConstBufferSequence>
boost::system::error_code void
handshake(handshake_type type, handshake(handshake_type type,
ConstBufferSequence const& buffers, ConstBufferSequence const& buffers,
boost::system::error_code& ec) 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. /** Start an asynchronous SSL handshake.
@ -504,10 +504,10 @@ public:
@param ec Set to indicate what error occurred, if any. @param ec Set to indicate what error occurred, if any.
*/ */
boost::system::error_code void
shutdown(boost::system::error_code& ec) shutdown(boost::system::error_code& ec)
{ {
return p_->next_layer().shutdown(ec); p_->next_layer().shutdown(ec);
} }
/** Asynchronously shut down SSL on the stream. /** Asynchronously shut down SSL on the stream.