mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: add missing `write()` call in MSE handshake (#6891) 

* refactor: tidy up variables in `tr_handshake::read_crypto_provide()`

* fix: make sure to send out `crypto_select`

* chore: fix comment

---------

Co-authored-by: Charles Kerr <charles@charleskerr.com>
This commit is contained in:
Yat Ho 2024-08-25 03:18:57 +08:00 committed by GitHub
parent b1a765459a
commit 34dbaaad7e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libtransmission/handshake.cc
View File

@ -415,8 +415,8 @@ ReadState tr_handshake::read_pad_a(tr_peerIo* peer_io)
ReadState tr_handshake::read_crypto_provide(tr_peerIo* peer_io)
{
/* HASH('req2', SKEY) xor HASH('req3', S), ENCRYPT(VC, crypto_provide, len(PadC)) */
auto obfuscated_hash = tr_sha1_digest_t{};
static auto constexpr Needlen = std::size(obfuscated_hash) + /* HASH('req2', SKEY) xor HASH('req3', S) */
auto x_or = tr_sha1_digest_t{};
static auto constexpr Needlen = std::size(x_or) + /* HASH('req2', SKEY) xor HASH('req3', S) */
std::size(VC) + sizeof(crypto_provide_) + sizeof(pad_c_len_);
if (peer_io->read_buffer_size() < Needlen)
@ -428,9 +428,9 @@ ReadState tr_handshake::read_crypto_provide(tr_peerIo* peer_io)
* we can get the first half of that (the obfuscatedTorrentHash)
* by building the latter and xor'ing it with what the peer sent us */
tr_logAddTraceHand(this, "reading obfuscated torrent hash...");
auto x_or = tr_sha1_digest_t{};
peer_io->read_bytes(std::data(x_or), std::size(x_or));
auto obfuscated_hash = tr_sha1_digest_t{};
auto const req3 = tr_sha1::digest("req3"sv, get_dh().secret());
for (size_t i = 0; i < std::size(obfuscated_hash); ++i)
{
@ -531,15 +531,17 @@ ReadState tr_handshake::read_ia(tr_peerIo* peer_io)
tr_logAddTraceHand(this, "sending pad d");
/* ENCRYPT(VC, crypto_provide, len(PadD), PadD
/* ENCRYPT(VC, crypto_select, len(PadD), PadD
* PadD is reserved for future extensions to the handshake...
* standard practice at this time is for it to be zero-length */
outbuf.add_uint16(0U);
// send it
peer_io->write(outbuf, false);
/* maybe de-encrypt our connection */
if (crypto_select_ == CryptoProvidePlaintext)
{
peer_io->write(outbuf, false);
TR_ASSERT(std::empty(outbuf));
// All future communications will use ENCRYPT2()