Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-04-28 03:37:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

AEAD/Chacha20/Poly1305 encryption

Browse source
This commit is contained in:
orignal 2018-06-13 11:41:46 -04:00
parent bf1e1ad457
commit df60e78766
5 changed files with 52 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
libi2pd/NTCP2.cpp
View file

@ -6,8 +6,6 @@
#include "I2PEndian.h"
#include "Crypto.h"
#include "Ed25519.h"
#include "ChaCha20.h"
#include "Poly1305.h"
#include "NTCP2.h"
namespace i2p
@ -52,7 +50,7 @@ namespace transport
m_Server.GetService ().post (std::bind (&NTCP2Session::Terminate, shared_from_this ()));
}
bool NTCP2Session::KeyDerivationFunction1 (const uint8_t * rs, const uint8_t * pub, uint8_t * derived)
bool NTCP2Session::KeyDerivationFunction1 (const uint8_t * rs, const uint8_t * pub, uint8_t * derived, uint8_t * ad)
{
static const char protocolName[] = "Noise_XK_25519_ChaChaPoly_SHA256"; // 32 bytes
uint8_t h[64], ck[33];
@ -63,7 +61,7 @@ namespace transport
SHA256 (h, 64, h);
// h = SHA256(h || pub)
memcpy (h + 32, pub, 32);
SHA256 (h, 64, h);
SHA256 (h, 64, ad);
// x25519 between rs and priv
uint8_t inputKeyMaterial[32];
BN_CTX * ctx = BN_CTX_new ();
@ -106,8 +104,8 @@ namespace transport
encryption.SetIV (m_RemoteIV);
encryption.Encrypt (x, 32, m_SessionRequestBuffer);
// encryption key for next block
uint8_t key[32];
KeyDerivationFunction1 (m_RemoteStaticKey, x, key);
uint8_t key[32], ad[32];
KeyDerivationFunction1 (m_RemoteStaticKey, x, key, ad);
// fill options
uint8_t options[32]; // actual options size is 16 bytes
memset (options, 0, 16);
@ -118,11 +116,9 @@ namespace transport
htobe32buf (options + 8, i2p::util::GetSecondsSinceEpoch ()); // tsA
// 4 bytes reserved
// sign and encrypt options
i2p::crypto::Poly1305HMAC (((uint32_t *)options) + 4, (uint32_t *)key, options, 16); // calculate MAC first
uint8_t nonce[12];
memset (nonce, 0, 12); // set nonce to zero
i2p::crypto::chacha20 (options, 16, nonce, key); // then encrypt
memcpy (m_SessionRequestBuffer + 32, options, 32);
i2p::crypto::AEADChaCha20Poly1305Encrypt (options, 16, ad, 32, key, nonce, m_SessionRequestBuffer + 32, 32);
// send message
boost::asio::async_write (m_Socket, boost::asio::buffer (m_SessionRequestBuffer, paddingLength + 64), boost::asio::transfer_all (),
std::bind(&NTCP2Session::HandleSessionRequestSent, shared_from_this (), std::placeholders::_1, std::placeholders::_2));