Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-05-12 17:52:17 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5918

Browse source 
4371791 epee: implement handshake timeout for SSL connections (xiphon)
This commit is contained in:
luigi1111 2019-10-08 14:30:45 -05:00
commit 18da0fa240
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 30 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
contrib/epee/include/net/net_helper.h
View file

@ -178,7 +178,7 @@ namespace net_utils
// SSL Options
if (m_ssl_options.support == epee::net_utils::ssl_support_t::e_ssl_support_enabled || m_ssl_options.support == epee::net_utils::ssl_support_t::e_ssl_support_autodetect)
{
if (!m_ssl_options.handshake(*m_ssl_socket, boost::asio::ssl::stream_base::client, addr))
if (!m_ssl_options.handshake(*m_ssl_socket, boost::asio::ssl::stream_base::client, addr, timeout))
{
if (m_ssl_options.support == epee::net_utils::ssl_support_t::e_ssl_support_autodetect)
{