diff options
| author | Bertrand Jacquin <bertrand@jacquin.bzh> | 2019-12-03 22:26:07 +0000 |
|---|---|---|
| committer | Bertrand Jacquin <bertrand@jacquin.bzh> | 2019-12-03 22:26:07 +0000 |
| commit | 7538b4e936629fad57dbd9497fc9fa197b886cb5 (patch) | |
| tree | 3759692518740c9f885b92b0998e8634d25e5f77 | |
| parent | ssl: server-side: allow multiple version of TLS (diff) | |
| download | monero-dev/beber/ssl.tar.xz | |
ssl: tlsv1.3 clientdev/beber/ssl
| -rw-r--r-- | contrib/epee/include/net/connection_basic.hpp | 2 | ||||
| -rw-r--r-- | contrib/epee/include/net/net_helper.h | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/contrib/epee/include/net/connection_basic.hpp b/contrib/epee/include/net/connection_basic.hpp index 2f60f7604..6650efe12 100644 --- a/contrib/epee/include/net/connection_basic.hpp +++ b/contrib/epee/include/net/connection_basic.hpp @@ -69,7 +69,7 @@ namespace net_utils connection_basic_shared_state() : ssl_options_(ssl_support_t::e_ssl_support_disabled), - ssl_context(boost::asio::ssl::context::tlsv12), + ssl_context(boost::asio::ssl::context::tls), sock_count(0), sock_number(0) {} diff --git a/contrib/epee/include/net/net_helper.h b/contrib/epee/include/net/net_helper.h index 81545e502..3530c6be2 100644 --- a/contrib/epee/include/net/net_helper.h +++ b/contrib/epee/include/net/net_helper.h @@ -102,7 +102,7 @@ namespace net_utils inline blocked_mode_client() : m_io_service(), - m_ctx(boost::asio::ssl::context::tlsv12), + m_ctx(boost::asio::ssl::context::tls), m_connector(direct_connect{}), m_ssl_socket(new boost::asio::ssl::stream<boost::asio::ip::tcp::socket>(m_io_service, m_ctx)), m_ssl_options(epee::net_utils::ssl_support_t::e_ssl_support_autodetect), @@ -144,8 +144,9 @@ namespace net_utils { if (ssl_options) m_ctx = ssl_options.create_context(); - else - m_ctx = boost::asio::ssl::context(boost::asio::ssl::context::tlsv12); + else { + m_ctx = boost::asio::ssl::context(boost::asio::ssl::context::tls); + } m_ssl_options = std::move(ssl_options); } |