diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-04-04 13:06:36 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-04-04 13:06:36 -0500 |
| commit | d86d1a4d29d578dfc905d9ea8086ca92654fe34a (patch) | |
| tree | df111e0bb822c9c4ecf5439ae12022936da91cb6 | |
| parent | Merge pull request #6364 (diff) | |
| parent | Use boost::asio::ssl::context::sslv23 for backwards compatibility (diff) | |
| download | monero-d86d1a4d29d578dfc905d9ea8086ca92654fe34a.tar.xz | |
Merge pull request #6370
3031deb Bump downloaded boost version to 1.72 (omartijn)
6079042 Use boost::asio::ssl::context::sslv23 for backwards compatibility (omartijn)
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | contrib/epee/src/net_ssl.cpp | 4 |
2 files changed, 7 insertions, 5 deletions
@@ -332,13 +332,13 @@ If you are using the older Raspbian Jessie image, compiling Monero is a bit more * Then, install the dependencies for Monero except `libunwind` and `libboost-all-dev` -* Install the latest version of boost (this may first require invoking `apt-get remove --purge libboost*` to remove a previous version if you're not using a clean install): +* Install the latest version of boost (this may first require invoking `apt-get remove --purge libboost*-dev` to remove a previous version if you're not using a clean install): ```bash cd - wget https://sourceforge.net/projects/boost/files/boost/1.64.0/boost_1_64_0.tar.bz2 - tar xvfo boost_1_64_0.tar.bz2 - cd boost_1_64_0 + wget https://sourceforge.net/projects/boost/files/boost/1.72.0/boost_1_72_0.tar.bz2 + tar xvfo boost_1_72_0.tar.bz2 + cd boost_1_72_0 ./bootstrap.sh sudo ./b2 ``` diff --git a/contrib/epee/src/net_ssl.cpp b/contrib/epee/src/net_ssl.cpp index 946499129..d7bb62049 100644 --- a/contrib/epee/src/net_ssl.cpp +++ b/contrib/epee/src/net_ssl.cpp @@ -289,7 +289,9 @@ ssl_options_t::ssl_options_t(std::vector<std::vector<std::uint8_t>> fingerprints boost::asio::ssl::context ssl_options_t::create_context() const { - boost::asio::ssl::context ssl_context{boost::asio::ssl::context::tls}; + // note: this enables a lot of old and insecure protocols, which we + // promptly disable below - if the result is actually used + boost::asio::ssl::context ssl_context{boost::asio::ssl::context::sslv23}; if (!bool(*this)) return ssl_context; |