PurpleI2P/i2pd
1
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-22 08:14:15 +00:00
Code Issues Releases Activity

correct frame size for I2NP msgs

Browse Source
This commit is contained in:
orignal 2018-12-03 12:29:24 -05:00
parent 5c3d0fc02c
commit 8fc3a1f9c9
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libi2pd/NTCP2.cpp
View File

@ -966,7 +966,8 @@ namespace transport
buf -= 3; buf -= 3;
buf[0] = eNTCP2BlkI2NPMessage; // blk buf[0] = eNTCP2BlkI2NPMessage; // blk
htobe16buf (buf + 1, len); // size htobe16buf (buf + 1, len); // size
len += 3; len += 3;
totalLen += len;
encryptBufs.push_back (std::make_pair (buf, len)); encryptBufs.push_back (std::make_pair (buf, len));
if (it == *msgs.begin ()) // first message if (it == *msgs.begin ()) // first message
{ {
@ -977,17 +978,17 @@ namespace transport
if (it == *msgs.rbegin () && it->len + 16 < it->maxLen) // last message if (it == *msgs.rbegin () && it->len + 16 < it->maxLen) // last message
{ {
// if it's long enough we add padding and MAC to it // if it's long enough we add padding and MAC to it
// allocate 16 bytes for MAC
len += 16;
// create padding block // create padding block
auto paddingLen = CreatePaddingBlock (totalLen + len, buf + len, it->maxLen - len); auto paddingLen = CreatePaddingBlock (totalLen, buf + len, it->maxLen - len - 16);
encryptBufs.push_back (std::make_pair (buf + len, paddingLen));
len += paddingLen; len += paddingLen;
totalLen += paddingLen; totalLen += paddingLen;
macBuf = buf + len; macBuf = buf + len;
// allocate 16 bytes for MAC
len += 16;
} }
bufs.push_back (boost::asio::buffer (buf, len)); bufs.push_back (boost::asio::buffer (buf, len));
totalLen += len;
} }
if (!macBuf) // last block was not enough for MAC if (!macBuf) // last block was not enough for MAC
@ -1005,7 +1006,7 @@ namespace transport
uint8_t nonce[12]; uint8_t nonce[12];
CreateNonce (m_SendSequenceNumber, nonce); m_SendSequenceNumber++; CreateNonce (m_SendSequenceNumber, nonce); m_SendSequenceNumber++;
i2p::crypto::AEADChaCha20Poly1305Encrypt (encryptBufs, m_SendKey, nonce, macBuf); // encrypt buffers i2p::crypto::AEADChaCha20Poly1305Encrypt (encryptBufs, m_SendKey, nonce, macBuf); // encrypt buffers
SetNextSentFrameLength (totalLen + 16, first->GetNTCP2Header () - 2); // frame length right before first block SetNextSentFrameLength (totalLen + 16, first->GetNTCP2Header () - 5); // frame length right before first block
// send buffers // send buffers
m_IsSending = true; m_IsSending = true;