mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd synced 2024-11-10 08:00:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

sign data for PeerTest msg 3 and 5

Browse Source
This commit is contained in:
orignal 2022-06-21 08:12:41 -04:00
parent 3a5295dbb9
commit ee20d5b804
2 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libi2pd/SSU2Session.cpp
View File

@ -1454,6 +1454,16 @@ namespace transport
} }
case 2: // Charlie from Bob case 2: // Charlie from Bob
{ {
// sign with Charlie's key
uint8_t asz = buf[44];
std::vector<uint8_t> newSignedData (asz + 10 + i2p::context.GetIdentity ()->GetSignatureLen ());
SignedData s;
s.Insert ((const uint8_t *)"PeerTestValidate", 16); // prologue
s.Insert (GetRemoteIdentity ()->GetIdentHash (), 32); // bhash
s.Insert (buf + 3, 32); // ahash
s.Insert (buf + 35, asz + 10); // ver, nonce, ts, asz, Alice's endpoint
s.Sign (i2p::context.GetPrivateKeys (), newSignedData.data () + 10 + asz);
// send response (msg 3) back and msg 5 if accepted
SSU2PeerTestCode code = eSSU2PeerTestCodeAccept; SSU2PeerTestCode code = eSSU2PeerTestCodeAccept;
auto r = i2p::data::netdb.FindRouter (buf + 3); // find Alice auto r = i2p::data::netdb.FindRouter (buf + 3); // find Alice
if (r) if (r)
@ -1461,7 +1471,7 @@ namespace transport
size_t signatureLen = r->GetIdentity ()->GetSignatureLen (); size_t signatureLen = r->GetIdentity ()->GetSignatureLen ();
if (len >= 35 + signatureLen) if (len >= 35 + signatureLen)
{ {
SignedData s; s.Reset ();
s.Insert ((const uint8_t *)"PeerTestValidate", 16); // prologue s.Insert ((const uint8_t *)"PeerTestValidate", 16); // prologue
s.Insert (GetRemoteIdentity ()->GetIdentHash (), 32); // bhash s.Insert (GetRemoteIdentity ()->GetIdentHash (), 32); // bhash
s.Insert (buf + 35 + signatureLen, len - 35 - signatureLen); // signed data s.Insert (buf + 35 + signatureLen, len - 35 - signatureLen); // signed data
@ -1482,7 +1492,7 @@ namespace transport
session->m_DestConnID = htobe64 (((uint64_t)nonce << 32) | nonce); session->m_DestConnID = htobe64 (((uint64_t)nonce << 32) | nonce);
session->m_SourceConnID = ~session->m_DestConnID; session->m_SourceConnID = ~session->m_DestConnID;
m_Server.AddSession (session); m_Server.AddSession (session);
session->SendPeerTest (5, buf + 35, len - 35, addr->i); session->SendPeerTest (5, newSignedData.data (), newSignedData.size (), addr->i);
} }
else else
code = eSSU2PeerTestCodeCharlieUnsupportedAddress; code = eSSU2PeerTestCodeCharlieUnsupportedAddress;
@ -1501,7 +1511,7 @@ namespace transport
// send msg 3 back to Bob // send msg 3 back to Bob
uint8_t payload[SSU2_MAX_PAYLOAD_SIZE]; uint8_t payload[SSU2_MAX_PAYLOAD_SIZE];
size_t payloadSize = CreatePeerTestBlock (payload, SSU2_MAX_PAYLOAD_SIZE, 3, size_t payloadSize = CreatePeerTestBlock (payload, SSU2_MAX_PAYLOAD_SIZE, 3,
code, nullptr, buf + 35, len - 35); code, nullptr, newSignedData.data (), newSignedData.size ());
payloadSize += CreatePaddingBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - payloadSize); payloadSize += CreatePaddingBlock (payload + payloadSize, SSU2_MAX_PAYLOAD_SIZE - payloadSize);
SendData (payload, payloadSize); SendData (payload, payloadSize);
break; break;
@ -1565,13 +1575,13 @@ namespace transport
LogPrint (eLogWarning, "SSU2: Unknown address for peer test 5"); LogPrint (eLogWarning, "SSU2: Unknown address for peer test 5");
} }
else else
LogPrint (eLogWarning, "SSU2: Peer test 5 nonce mismatch ", nonce); LogPrint (eLogWarning, "SSU2: Peer test 5 nonce mismatch ", nonce, " connID=", m_SourceConnID);
break; break;
case 6: // Charlie from Alice case 6: // Charlie from Alice
if (m_Address) if (m_Address)
SendPeerTest (7, buf + 3, len - 3, m_Address->i); SendPeerTest (7, buf + 3, len - 3, m_Address->i);
else else
LogPrint (eLogWarning, "SSU2: Unknown addrees for peer test 6"); LogPrint (eLogWarning, "SSU2: Unknown address for peer test 6");
m_Server.RemoveSession (~(((uint64_t)htobe32 (nonce) << 32) | htobe32 (nonce))); m_Server.RemoveSession (~(((uint64_t)htobe32 (nonce) << 32) | htobe32 (nonce)));
break; break;
case 7: // Alice from Charlie 2 case 7: // Alice from Charlie 2

6
libi2pd/TransportSession.h
View File

@ -33,6 +33,12 @@ namespace transport
{ {
m_Stream << other.m_Stream.rdbuf (); m_Stream << other.m_Stream.rdbuf ();
} }
void Reset ()
{
m_Stream.str("");
}
void Insert (const uint8_t * buf, size_t len) void Insert (const uint8_t * buf, size_t len)
{ {
m_Stream.write ((char *)buf, len); m_Stream.write ((char *)buf, len);