aboutsummaryrefslogtreecommitdiff
path: root/contrib/epee/include/net/net_helper.h
diff options
context:
space:
mode:
authorxiphon <xiphon@protonmail.com>2019-09-17 22:19:48 +0000
committerxiphon <xiphon@protonmail.com>2019-09-17 22:21:16 +0000
commit4371791977a18653da16a99f41de46cee5fa337b (patch)
treec695c99378d59132102c4526120aed34fe6be844 /contrib/epee/include/net/net_helper.h
parentMerge pull request #5876 (diff)
downloadmonero-4371791977a18653da16a99f41de46cee5fa337b.tar.xz
epee: implement handshake timeout for SSL connections
Diffstat (limited to 'contrib/epee/include/net/net_helper.h')
-rw-r--r--contrib/epee/include/net/net_helper.h2
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 2b02eafa4..fff0ed7ef 100644
--- a/contrib/epee/include/net/net_helper.h
+++ b/contrib/epee/include/net/net_helper.h
@@ -177,7 +177,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)
{