diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2016-01-25 10:47:48 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2016-01-25 10:47:48 -0500 |
| commit | 9e92f7993264c5dc9df53c4f6aaf19d3c13783cd (patch) | |
| tree | 49fb1c17ca2ee71176d4d964eee57da457f7edb3 /tea.cpp | |
| parent | be491ef0073a752a52efa6067fe8e29a2e530d69 (diff) | |
| download | cryptopp-git-9e92f7993264c5dc9df53c4f6aaf19d3c13783cd.tar.gz | |
Cleared -Wcast-align (Issue 122)
Diffstat (limited to 'tea.cpp')
| -rw-r--r-- | tea.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -106,9 +106,12 @@ void XTEA::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, by void BTEA::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
{
CRYPTOPP_UNUSED(xorBlock);
+ assert(IsAlignedOn(inBlock,GetAlignmentOf<word32>()));
+ assert(IsAlignedOn(outBlock,GetAlignmentOf<word32>()));
+
unsigned int n = m_blockSize / 4;
- word32 *v = (word32*)outBlock;
- ConditionalByteReverse(BIG_ENDIAN_ORDER, v, (const word32*)inBlock, m_blockSize);
+ word32 *v = (word32*)(void *)outBlock;
+ ConditionalByteReverse(BIG_ENDIAN_ORDER, v, (const word32*)(void *)inBlock, m_blockSize);
word32 y = v[0], z = v[n-1], e;
word32 p, q = 6+52/n;
@@ -133,9 +136,12 @@ void BTEA::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, by void BTEA::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
{
CRYPTOPP_UNUSED(xorBlock);
+ assert(IsAlignedOn(inBlock,GetAlignmentOf<word32>()));
+ assert(IsAlignedOn(outBlock,GetAlignmentOf<word32>()));
+
unsigned int n = m_blockSize / 4;
- word32 *v = (word32*)outBlock;
- ConditionalByteReverse(BIG_ENDIAN_ORDER, v, (const word32*)inBlock, m_blockSize);
+ word32 *v = (word32*)(void *)outBlock;
+ ConditionalByteReverse(BIG_ENDIAN_ORDER, v, (const word32*)(void *)inBlock, m_blockSize);
word32 y = v[0], z = v[n-1], e;
word32 p, q = 6+52/n;
|