forked from premiere/premiere-libtorrent
fix build with openssl and deprecated functions disabled
This commit is contained in:
parent
dcd6af6473
commit
e5ccb63375
|
@ -5387,11 +5387,6 @@ retry:
|
|||
boost::uint16_t session_impl::ssl_listen_port() const
|
||||
{
|
||||
#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
|
||||
// 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
|
||||
|
|
|
@ -7698,7 +7698,7 @@ namespace libtorrent
|
|||
|
||||
void* userdata = 0;
|
||||
#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();
|
||||
}
|
||||
|
|
|
@ -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
|
||||
// previous async. calls have completed
|
||||
ses1.status();
|
||||
ses2.status();
|
||||
ses1.listen_port();
|
||||
ses2.listen_port();
|
||||
}
|
||||
|
||||
wait_for_alert(ses1, torrent_finished_alert::alert_type, "ses1");
|
||||
|
|
Loading…
Reference in New Issue