Skip to content

Commit

Permalink
check for duplicates
Browse files Browse the repository at this point in the history
  • Loading branch information
orignal committed Jun 17, 2014
1 parent 566909a commit ebd64c9
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 1 deletion.
5 changes: 5 additions & 0 deletions SSU.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,11 @@ namespace ssu
else
{
ScheduleTermination ();
// check for duplicate
const uint8_t * iv = ((SSUHeader *)buf)->iv;
if (m_ReceivedIVs.count (iv)) return; // duplicate detected
m_ReceivedIVs.insert (iv);

if (m_IsSessionKey && Validate (buf, len, m_MacKey)) // try session key first
DecryptSessionKey (buf, len);
else
Expand Down
18 changes: 17 additions & 1 deletion SSU.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define SSU_H__

#include <inttypes.h>
#include <string.h>
#include <map>
#include <list>
#include <set>
Expand Down Expand Up @@ -112,7 +113,21 @@ namespace ssu
void HandleTerminationTimer (const boost::system::error_code& ecode);

private:


union IV
{
uint8_t buf[16];
uint64_t ll[2];

IV (const IV&) = default;
IV (const uint8_t * iv) { memcpy (buf, iv, 16); };
bool operator< (const IV& other) const
{
if (ll[0] != other.ll[0]) return ll[0] < other.ll[0];
return ll[1] < other.ll[1];
};
};

friend class SSUData; // TODO: change in later
SSUServer& m_Server;
boost::asio::ip::udp::endpoint m_RemoteEndpoint;
Expand All @@ -128,6 +143,7 @@ namespace ssu
i2p::crypto::CBCDecryption m_SessionKeyDecryption;
uint8_t m_SessionKey[32], m_MacKey[32];
std::list<i2p::I2NPMessage *> m_DelayedMessages;
std::set<IV> m_ReceivedIVs;
SSUData m_Data;
};

Expand Down

0 comments on commit ebd64c9

Please sign in to comment.