encryption fix

This commit is contained in:
Arvid Norberg 2007-10-31 23:51:45 +00:00
parent 3468e97b24
commit c982ba5d90
1 changed files with 3 additions and 8 deletions

View File

@ -582,9 +582,8 @@ namespace libtorrent
{
TORRENT_ASSERT(buf);
TORRENT_ASSERT(size > 0);
TORRENT_ASSERT(!m_rc4_encrypted || m_encrypted);
if (m_rc4_encrypted)
if (m_encrypted && m_rc4_encrypted)
m_RC4_handler->encrypt(buf, size);
peer_connection::send_buffer(buf, size);
@ -592,9 +591,7 @@ namespace libtorrent
buffer::interval bt_peer_connection::allocate_send_buffer(int size)
{
TORRENT_ASSERT(!m_rc4_encrypted || m_encrypted);
if (m_rc4_encrypted)
if (m_encrypted && m_rc4_encrypted)
{
TORRENT_ASSERT(m_enc_send_buffer.left() == 0);
m_enc_send_buffer = peer_connection::allocate_send_buffer(size);
@ -609,9 +606,7 @@ namespace libtorrent
void bt_peer_connection::setup_send()
{
TORRENT_ASSERT(!m_rc4_encrypted || m_encrypted);
if (m_rc4_encrypted && m_enc_send_buffer.left())
if (m_encrypted && m_rc4_encrypted && m_enc_send_buffer.left())
{
TORRENT_ASSERT(m_enc_send_buffer.begin);
TORRENT_ASSERT(m_enc_send_buffer.end);