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

encrypt SessionRequest options block

Browse Source
This commit is contained in:
orignal 2018-06-05 16:15:33 -04:00
parent 8c9eaccc11
commit a70d0edf2e
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libi2pd/NTCP2.cpp
View File

@ -24,8 +24,8 @@ namespace transport
{ {
static const char protocolName[] = "Noise_XK_25519_ChaChaPoly_SHA256"; // 32 bytes static const char protocolName[] = "Noise_XK_25519_ChaChaPoly_SHA256"; // 32 bytes
uint8_t h[64], ck[33]; uint8_t h[64], ck[33];
SHA256 ((const uint8_t *)protocolName, 32, h); memcpy (ck, protocolName, 32);
memcpy (ck, h, 32); SHA256 ((const uint8_t *)protocolName, 32, h);
// h = SHA256(h || rs) // h = SHA256(h || rs)
memcpy (h + 32, rs, 32); memcpy (h + 32, rs, 32);
SHA256 (h, 64, h); SHA256 (h, 64, h);
@ -60,7 +60,7 @@ namespace transport
BN_CTX_free (ctx); BN_CTX_free (ctx);
} }
void NTCP2Session::SendSessionRequest (const uint8_t * iv) void NTCP2Session::SendSessionRequest (const uint8_t * iv, const uint8_t * rs)
{ {
i2p::crypto::AESAlignedBuffer<32> x; i2p::crypto::AESAlignedBuffer<32> x;
CreateEphemeralKey (x); CreateEphemeralKey (x);
@ -68,7 +68,15 @@ namespace transport
i2p::crypto::CBCEncryption encryption; i2p::crypto::CBCEncryption encryption;
encryption.SetKey (GetRemoteIdentity ()->GetIdentHash ()); encryption.SetKey (GetRemoteIdentity ()->GetIdentHash ());
encryption.SetIV (iv); encryption.SetIV (iv);
encryption.Encrypt (2, x.GetChipherBlock (), x.GetChipherBlock ()); encryption.Encrypt (2, x.GetChipherBlock (), x.GetChipherBlock ());
// encryption key for next block
uint8_t key[32];
KeyDerivationFunction (rs, x, key);
// options
uint8_t options[32];
// TODO: fill 16 bytes options
i2p::crypto::Poly1305HMAC (((uint32_t *)options) + 4, (uint32_t *)key, options, 16); // calculate MAC first
i2p::crypto::chacha20 (options, 16, 0, key); // then encrypt
} }
} }
} }

2
libi2pd/NTCP2.h
View File

@ -21,7 +21,7 @@ namespace transport
bool KeyDerivationFunction (const uint8_t * rs, const uint8_t * pub, uint8_t * derived); bool KeyDerivationFunction (const uint8_t * rs, const uint8_t * pub, uint8_t * derived);
void CreateEphemeralKey (uint8_t * pub); void CreateEphemeralKey (uint8_t * pub);
void SendSessionRequest (const uint8_t * iv); void SendSessionRequest (const uint8_t * iv, const uint8_t * rs);
private: private: