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

merged encryption settings fix from RC_0_16

This commit is contained in:
Arvid Norberg 2013-05-08 05:43:17 +00:00
parent fd44cdbba5
commit 7745a2831d
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -20,6 +20,7 @@
* fix uTP edge case where udp socket buffer fills up
* fix nagle implementation in uTP
* fix encryption level handle invalid values
* add a number of missing functions to the python binding
* fix typo in Jamfile for building shared libraries
* prevent tracker exchange for magnet links before metadata is received

17
src/bt_peer_connection.cpp
View File

@ -474,20 +474,15 @@ namespace libtorrent
// write the verification constant and crypto field
int encrypt_size = sizeof(msg) - 512 + pad_size - 40;
int crypto_provide = 0;
pe_settings::enc_level const& allowed_enc_level = m_ses.get_pe_settings().allowed_enc_level;
pe_settings::enc_level crypto_provide = m_ses.get_pe_settings().allowed_enc_level;
if (allowed_enc_level == pe_settings::both)
crypto_provide = 0x03;
else if (allowed_enc_level == pe_settings::rc4)
crypto_provide = 0x02;
else if (allowed_enc_level == pe_settings::plaintext)
crypto_provide = 0x01;
// this is an invalid setting, but let's just make the best of the situation
if ((crypto_provide & pe_settings::both) == 0) crypto_provide = pe_settings::both;
#ifdef TORRENT_VERBOSE_LOGGING
char const* level[] = {"plaintext", "rc4", "plaintext rc4"};
peer_log(" crypto provide : [ %s ]"
, level[allowed_enc_level-1]);
, level[crypto_provide-1]);
#endif
write_pe_vc_cryptofield(ptr, encrypt_size, crypto_provide, pad_size);
@ -2714,8 +2709,8 @@ namespace libtorrent
if (crypto_select == 0)
{
disconnect(errors::unsupported_encryption_mode, 1);
return;
disconnect(errors::unsupported_encryption_mode, 1);
return;
}
// write the pe4 step