GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enforce strict aliasing rule and avoid alignment issues.

Browse Source
This commit is contained in:
Vincent Richard 2013-11-28 23:23:35 +01:00
parent 2232b60430
commit 92fc0b34b0
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/security/digest/md5/md5MessageDigest.cpp
View File

@ -147,11 +147,11 @@ void md5MessageDigest::update(const byte_t* data, const unsigned long length)
if (avail > len) if (avail > len)
{ {
copyUint8Array(m_block + (64 - avail), data, len); copyUint8Array(m_block.b8 + (64 - avail), data, len);
return; return;
} }
copyUint8Array(m_block + (64 - avail), data, avail); copyUint8Array(m_block.b8 + (64 - avail), data, avail);
transformHelper(); transformHelper();
data += avail; data += avail;
@ -159,14 +159,14 @@ void md5MessageDigest::update(const byte_t* data, const unsigned long length)
while (len >= 64) while (len >= 64)
{ {
copyUint8Array(m_block, data, 64); copyUint8Array(m_block.b8, data, 64);
transformHelper(); transformHelper();
data += 64; data += 64;
len -= 64; len -= 64;
} }
copyUint8Array(m_block, data, len); copyUint8Array(m_block.b8, data, len);
} }
@ -196,7 +196,7 @@ void md5MessageDigest::finalize()
{ {
const long offset = m_byteCount & 0x3f; const long offset = m_byteCount & 0x3f;
vmime_uint8* p = m_block + offset; vmime_uint8* p = m_block.b8 + offset;
long padding = 56 - (offset + 1); long padding = 56 - (offset + 1);
*p++ = 0x80; *p++ = 0x80;
@ -205,23 +205,23 @@ void md5MessageDigest::finalize()
{ {
memset(p, 0x00, padding + 8); memset(p, 0x00, padding + 8);
transformHelper(); transformHelper();
p = m_block; p = m_block.b8;
padding = 56; padding = 56;
} }
memset(p, 0, padding); memset(p, 0, padding);
reinterpret_cast <vmime_uint32*>(m_block)[14] = static_cast <vmime_uint32>(m_byteCount << 3); m_block.b32[14] = static_cast <vmime_uint32>(m_byteCount << 3);
reinterpret_cast <vmime_uint32*>(m_block)[15] = static_cast <vmime_uint32>(m_byteCount >> 29); m_block.b32[15] = static_cast <vmime_uint32>(m_byteCount >> 29);
#if VMIME_BYTE_ORDER_BIG_ENDIAN #if VMIME_BYTE_ORDER_BIG_ENDIAN
swapUint32Array((vmime_uint32*) m_block, (64 - 8) / 4); swapUint32Array(m_block.b32, (64 - 8) / 4);
#endif #endif
transform(); transform();
#if VMIME_BYTE_ORDER_BIG_ENDIAN #if VMIME_BYTE_ORDER_BIG_ENDIAN
swapUint32Array((vmime_uint32*) m_hash, 4); swapUint32Array(m_hash, 4);
#endif #endif
m_finalized = true; m_finalized = true;
@ -231,7 +231,7 @@ void md5MessageDigest::finalize()
void md5MessageDigest::transformHelper() void md5MessageDigest::transformHelper()
{ {
#if VMIME_BYTE_ORDER_BIG_ENDIAN #if VMIME_BYTE_ORDER_BIG_ENDIAN
swapUint32Array((vmime_uint32*) m_block, 64 / 4); swapUint32Array(m_block.b32, 64 / 4);
#endif #endif
transform(); transform();
} }
@ -239,7 +239,7 @@ void md5MessageDigest::transformHelper()
void md5MessageDigest::transform() void md5MessageDigest::transform()
{ {
const vmime_uint32* const in = reinterpret_cast <vmime_uint32*>(m_block); const vmime_uint32* const in = m_block.b32;
vmime_uint32 a = m_hash[0]; vmime_uint32 a = m_hash[0];
vmime_uint32 b = m_hash[1]; vmime_uint32 b = m_hash[1];

8
vmime/security/digest/md5/md5MessageDigest.hpp
View File

@ -63,8 +63,14 @@ protected:
vmime_uint32 m_hash[4]; vmime_uint32 m_hash[4];
union BlockType
{
vmime_uint32 b32[16];
vmime_uint8 b8[64];
};
unsigned long m_byteCount; unsigned long m_byteCount;
vmime_uint8 m_block[64]; BlockType m_block;
bool m_finalized; bool m_finalized;
}; };