Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-03-13 04:46:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

TunnelDecryption for tunnels

Browse source
This commit is contained in:
orignal 2014-05-15 18:58:26 -04:00
parent 7754968e7a
commit 0d51f240d0
3 changed files with 18 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
I2NPProtocol.cpp
View file

@ -1,8 +1,6 @@
#include <string.h> #include <string.h>
#include "I2PEndian.h" #include "I2PEndian.h"
#include <cryptopp/sha.h> #include <cryptopp/sha.h>
#include <cryptopp/modes.h>
#include <cryptopp/aes.h>
#include <cryptopp/gzip.h> #include <cryptopp/gzip.h>
#include "ElGamal.h" #include "ElGamal.h"
#include "Timestamp.h" #include "Timestamp.h"
@ -259,11 +257,12 @@ namespace i2p
//TODO: fill filler //TODO: fill filler
CryptoPP::SHA256().CalculateDigest(reply->hash, reply->padding, sizeof (reply->padding) + 1); // + 1 byte of ret CryptoPP::SHA256().CalculateDigest(reply->hash, reply->padding, sizeof (reply->padding) + 1); // + 1 byte of ret
// encrypt reply // encrypt reply
CryptoPP::CBC_Mode<CryptoPP::AES>::Encryption encryption; i2p::crypto::CBCEncryption encryption;
for (int j = 0; j < num; j++) for (int j = 0; j < num; j++)
{ {
encryption.SetKeyWithIV (clearText.replyKey, 32, clearText.replyIV); encryption.SetKey (clearText.replyKey);
encryption.ProcessData((uint8_t *)(records + j), (uint8_t *)(records + j), sizeof (records[j])); encryption.SetIV (clearText.replyIV);
encryption.Encrypt((uint8_t *)(records + j), sizeof (records[j]), (uint8_t *)(records + j));
} }
return true; return true;
} }

28
Tunnel.cpp
View file

@ -51,14 +51,17 @@ namespace tunnel
i++; i++;
hop = hop->next; hop = hop->next;
} }
i2p::crypto::CBCDecryption decryption;
hop = m_Config->GetLastHop ()->prev; hop = m_Config->GetLastHop ()->prev;
size_t ind = numRecords - 1; size_t ind = numRecords - 1;
while (hop) while (hop)
{ {
for (size_t i = ind; i < numRecords; i++) decryption.SetKey (hop->replyKey);
hop->decryption.Decrypt((uint8_t *)&records[i], decryption.SetIV (hop->replyIV);
sizeof (I2NPBuildRequestRecordElGamalEncrypted), (uint8_t *)&records[i]); for (size_t i = ind; i < numRecords; i++)
decryption.Decrypt((uint8_t *)&records[i],
sizeof (I2NPBuildRequestRecordElGamalEncrypted), (uint8_t *)&records[i]);
hop = hop->prev; hop = hop->prev;
ind--; ind--;
} }
@ -74,14 +77,17 @@ namespace tunnel
{ {
LogPrint ("TunnelBuildResponse ", (int)msg[0], " records."); LogPrint ("TunnelBuildResponse ", (int)msg[0], " records.");
i2p::crypto::CBCDecryption decryption;
TunnelHopConfig * hop = m_Config->GetLastHop (); TunnelHopConfig * hop = m_Config->GetLastHop ();
int num = msg[0]; int num = msg[0];
while (hop) while (hop)
{ {
decryption.SetKey (hop->replyKey);
decryption.SetIV (hop->replyIV);
for (int i = 0; i < num; i++) for (int i = 0; i < num; i++)
{ {
uint8_t * record = msg + 1 + i*sizeof (I2NPBuildResponseRecord); uint8_t * record = msg + 1 + i*sizeof (I2NPBuildResponseRecord);
hop->decryption.Decrypt(record, sizeof (I2NPBuildResponseRecord), record); decryption.Decrypt(record, sizeof (I2NPBuildResponseRecord), record);
} }
hop = hop->prev; hop = hop->prev;
num--; num--;
@ -102,8 +108,7 @@ namespace tunnel
TunnelHopConfig * hop = m_Config->GetFirstHop (); TunnelHopConfig * hop = m_Config->GetFirstHop ();
while (hop) while (hop)
{ {
hop->decryption.SetKey (hop->layerKey); hop->decryption.SetKeys (hop->layerKey, hop->ivKey);
hop->ivDecryption.SetKey (hop->ivKey);
hop = hop->next; hop = hop->next;
} }
} }
@ -116,14 +121,7 @@ namespace tunnel
TunnelHopConfig * hop = m_Config->GetLastHop (); TunnelHopConfig * hop = m_Config->GetLastHop ();
while (hop) while (hop)
{ {
// iv hop->decryption.Decrypt (payload);
hop->ivDecryption.Decrypt ((i2p::crypto::ChipherBlock *)payload, (i2p::crypto::ChipherBlock *)payload);
// data
hop->decryption.SetIV (payload);
hop->decryption.Decrypt (payload + 16, TUNNEL_DATA_ENCRYPTED_SIZE, payload+16);
// double iv ecncryption
hop->ivDecryption.Decrypt ((i2p::crypto::ChipherBlock *)payload, (i2p::crypto::ChipherBlock *)payload);
hop = hop->prev; hop = hop->prev;
} }
} }

5
TunnelConfig.h
View file

@ -23,8 +23,7 @@ namespace tunnel
bool isGateway, isEndpoint; bool isGateway, isEndpoint;
TunnelHopConfig * next, * prev; TunnelHopConfig * next, * prev;
i2p::crypto::CBCDecryption decryption; i2p::crypto::TunnelDecryption decryption;
i2p::crypto::ECBDecryption ivDecryption;
TunnelHopConfig (const i2p::data::RouterInfo * r) TunnelHopConfig (const i2p::data::RouterInfo * r)
{ {
@ -41,8 +40,6 @@ namespace tunnel
next = 0; next = 0;
prev = 0; prev = 0;
decryption.SetKey (replyKey);
decryption.SetIV (replyIV);
} }
void SetNextRouter (const i2p::data::RouterInfo * r) void SetNextRouter (const i2p::data::RouterInfo * r)