Browse Source

16 bytes alignmen of AES block

pull/113/head
orignal 10 years ago
parent
commit
357a9a6a56
  1. 1
      Garlic.cpp
  2. 6
      I2NPProtocol.h
  3. 2
      aes.h

1
Garlic.cpp

@ -83,6 +83,7 @@ namespace garlic @@ -83,6 +83,7 @@ namespace garlic
I2NPMessage * GarlicRoutingSession::WrapSingleMessage (I2NPMessage * msg)
{
I2NPMessage * m = NewI2NPMessage ();
m->Align (12); // in order to get buf aligned to 16 (12 + 4)
size_t len = 0;
uint8_t * buf = m->GetPayload () + 4; // 4 bytes for length

6
I2NPProtocol.h

@ -118,6 +118,12 @@ namespace tunnel @@ -118,6 +118,12 @@ namespace tunnel
uint8_t * GetBuffer () { return buf + offset; };
const uint8_t * GetBuffer () const { return buf + offset; };
size_t GetLength () const { return len - offset; };
void Align (size_t alignment)
{
size_t rem = ((size_t)GetBuffer ()) % alignment;
if (rem)
offset += (alignment - rem);
}
I2NPMessage& operator=(const I2NPMessage& other)
{

2
aes.h

@ -45,7 +45,7 @@ namespace crypto @@ -45,7 +45,7 @@ namespace crypto
AESAlignedBuffer ()
{
m_Buf = m_UnalignedBuffer;
uint8_t rem = ((uint64_t)m_Buf) & 0x0f;
uint8_t rem = ((size_t)m_Buf) & 0x0f;
if (rem)
m_Buf += (16 - rem);
}

Loading…
Cancel
Save