diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-10-08 14:30:45 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-10-08 14:30:45 -0500 |
| commit | 18da0fa240d936d93050a3430ebc2b93d5784a2c (patch) | |
| tree | c14d63fce3afc70c88e774d3a0c551eeacb300af /contrib/epee/include/net/net_helper.h | |
| parent | Merge pull request #5917 (diff) | |
| parent | epee: implement handshake timeout for SSL connections (diff) | |
| download | monero-18da0fa240d936d93050a3430ebc2b93d5784a2c.tar.xz | |
Merge pull request #5918
4371791 epee: implement handshake timeout for SSL connections (xiphon)
Diffstat (limited to 'contrib/epee/include/net/net_helper.h')
| -rw-r--r-- | contrib/epee/include/net/net_helper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/epee/include/net/net_helper.h b/contrib/epee/include/net/net_helper.h index e2dedfdd0..81545e502 100644 --- a/contrib/epee/include/net/net_helper.h +++ b/contrib/epee/include/net/net_helper.h @@ -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) { |