monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 03:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #6370

Browse source 
3031deb Bump downloaded boost version to 1.72 (omartijn)
6079042 Use boost::asio::ssl::context::sslv23 for backwards compatibility (omartijn)
This commit is contained in:
luigi1111 2020-04-04 13:06:36 -05:00
commit d86d1a4d29
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
README.md
View file

@ -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` * 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 ```bash
cd cd
wget https://sourceforge.net/projects/boost/files/boost/1.64.0/boost_1_64_0.tar.bz2 wget https://sourceforge.net/projects/boost/files/boost/1.72.0/boost_1_72_0.tar.bz2
tar xvfo boost_1_64_0.tar.bz2 tar xvfo boost_1_72_0.tar.bz2
cd boost_1_64_0 cd boost_1_72_0
./bootstrap.sh ./bootstrap.sh
sudo ./b2 sudo ./b2
``` ```

4
contrib/epee/src/net_ssl.cpp
View file

@ -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_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)) if (!bool(*this))
return ssl_context; return ssl_context;