Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-01-23 05:47:17 +01:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

KDF and encryption for SessionRequest

Browse source
This commit is contained in:
orignal 2022-02-10 14:03:09 -05:00
parent 61ec873842
commit 04388325a8
2 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
libi2pd/SSU2.cpp
View file

@ -15,7 +15,8 @@ namespace transport
{ {
SSU2Session::SSU2Session (std::shared_ptr<const i2p::data::RouterInfo> in_RemoteRouter, SSU2Session::SSU2Session (std::shared_ptr<const i2p::data::RouterInfo> in_RemoteRouter,
std::shared_ptr<const i2p::data::RouterInfo::Address> addr, bool peerTest): std::shared_ptr<const i2p::data::RouterInfo::Address> addr, bool peerTest):
TransportSession (in_RemoteRouter, SSU2_TERMINATION_TIMEOUT) TransportSession (in_RemoteRouter, SSU2_TERMINATION_TIMEOUT),
m_Address (addr)
{ {
m_NoiseState.reset (new i2p::crypto::NoiseSymmetricState); m_NoiseState.reset (new i2p::crypto::NoiseSymmetricState);
if (in_RemoteRouter && addr) if (in_RemoteRouter && addr)
@ -28,5 +29,38 @@ namespace transport
SSU2Session::~SSU2Session () SSU2Session::~SSU2Session ()
{ {
} }
void SSU2Session::SendSessionRequest ()
{
m_EphemeralKeys = i2p::transport::transports.GetNextX25519KeysPair ();
m_NoiseState->MixHash (m_EphemeralKeys->GetPublicKey (), 32);
uint8_t sharedSecret[32];
m_EphemeralKeys->Agree (m_Address->s, sharedSecret);
m_NoiseState->MixKey (sharedSecret);
uint8_t packet[1200]; // TODO: correct packet size
size_t packetSize = 64;
// fill packet
memcpy (packet + 32, m_EphemeralKeys->GetPublicKey (), 32); // X
// encrypt
CreateHeaderMask (m_Address->i, packet + (packetSize - 24), m_Address->i, packet + (packetSize - 12));
EncryptHeader (*(i2p::crypto::ChipherBlock *)packet);
uint8_t nonce[12] = {0};
i2p::crypto::ChaCha20 (packet + 16, 48, m_Address->i, nonce, packet + 16);
i2p::crypto::AEADChaCha20Poly1305 (packet + 64, packetSize - 64, m_NoiseState->m_H, 32, m_NoiseState->m_CK, nonce, packet + 64, packetSize - 48, true);
}
void SSU2Session::EncryptHeader (i2p::crypto::ChipherBlock& header)
{
header ^= m_HeaderMask;
}
void SSU2Session::CreateHeaderMask (const uint8_t * kh1, const uint8_t * nonce1, const uint8_t * kh2, const uint8_t * nonce2)
{
// Header Encryption KDF
uint8_t data[8] = {0};
i2p::crypto::ChaCha20 (data, 8, kh1, nonce1, m_HeaderMask.buf);
i2p::crypto::ChaCha20 (data, 8, kh2, nonce2, m_HeaderMask.buf + 8);
}
} }
} }

9
libi2pd/SSU2.h
View file

@ -28,10 +28,19 @@ namespace transport
std::shared_ptr<const i2p::data::RouterInfo::Address> addr = nullptr, bool peerTest = false); std::shared_ptr<const i2p::data::RouterInfo::Address> addr = nullptr, bool peerTest = false);
~SSU2Session (); ~SSU2Session ();
private:
void SendSessionRequest ();
void EncryptHeader (i2p::crypto::ChipherBlock& header);
void CreateHeaderMask (const uint8_t * kh1, const uint8_t * nonce1, const uint8_t * kh2, const uint8_t * nonce2);
private: private:
std::shared_ptr<i2p::crypto::X25519Keys> m_EphemeralKeys; std::shared_ptr<i2p::crypto::X25519Keys> m_EphemeralKeys;
std::unique_ptr<i2p::crypto::NoiseSymmetricState> m_NoiseState; std::unique_ptr<i2p::crypto::NoiseSymmetricState> m_NoiseState;
std::shared_ptr<const i2p::data::RouterInfo::Address> m_Address;
i2p::crypto::ChipherBlock m_HeaderMask;
}; };
} }
} }