wornvirtue
/
premiere-libtorrent
forked from premiere/premiere-libtorrent
1
0
Fork 0
Code Pull Requests Activity

Merge pull request #492 from arvidn/fix-ssl-deprecated-1.1 

fix build with openssl and deprecated functions disabled
This commit is contained in:
Arvid Norberg 2016-02-24 21:18:43 -05:00
parent 81568724e8 e5ccb63375
commit 842d6fbca4
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/session_impl.cpp
View File

@ -5387,11 +5387,6 @@ retry:
boost::uint16_t session_impl::ssl_listen_port() const boost::uint16_t session_impl::ssl_listen_port() const
{ {
#ifdef TORRENT_USE_OPENSSL #ifdef TORRENT_USE_OPENSSL
// honor the SSL listen port being disabled
if (m_settings.get_int(settings_pack::ssl_listen) == 0)
return 0;
// if peer connections are set up to be received over a socks // if peer connections are set up to be received over a socks
// proxy, and it's the same one as we're using for the tracker // proxy, and it's the same one as we're using for the tracker
// just tell the tracker the socks5 port we're listening on // just tell the tracker the socks5 port we're listening on

2
src/torrent.cpp
View File

@ -7698,7 +7698,7 @@ namespace libtorrent
void* userdata = 0; void* userdata = 0;
#ifdef TORRENT_USE_OPENSSL #ifdef TORRENT_USE_OPENSSL
if (is_ssl_torrent() && settings().get_int(settings_pack::ssl_listen) != 0) if (is_ssl_torrent())
{ {
userdata = m_ssl_ctx.get(); userdata = m_ssl_ctx.get();
} }

4
test/test_ssl.cpp
View File

@ -205,8 +205,8 @@ void test_ssl(int test_idx, bool use_utp)
{ {
// this will cause a round-trip to the main thread, and make sure the // this will cause a round-trip to the main thread, and make sure the
// previous async. calls have completed // previous async. calls have completed
ses1.status(); ses1.listen_port();
ses2.status(); ses2.listen_port();
} }
wait_for_alert(ses1, torrent_finished_alert::alert_type, "ses1"); wait_for_alert(ses1, torrent_finished_alert::alert_type, "ses1");