arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleared -Wcast-align (Issue 122)

pull/136/head
Jeffrey Walton 2016-01-25 10:47:48 -05:00
parent be491ef007
commit 9e92f79932
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcm.cpp
View File

@ -80,7 +80,10 @@ __m128i _mm_clmulepi64_si128(const __m128i &a, const __m128i &b, int i)
inline static void SSE2_Xor16(byte *a, const byte *b, const byte *c)
{
#if CRYPTOPP_BOOL_SSE2_INTRINSICS_AVAILABLE
*(__m128i *)a = _mm_xor_si128(*(__m128i *)b, *(__m128i *)c);
assert(IsAlignedOn(a,GetAlignmentOf<__m128i>()));
assert(IsAlignedOn(b,GetAlignmentOf<__m128i>()));
assert(IsAlignedOn(c,GetAlignmentOf<__m128i>()));
*(__m128i *)(void *)a = _mm_xor_si128(*(__m128i *)(void *)b, *(__m128i *)(void *)c);
#else
asm ("movdqa %1, %%xmm0; pxor %2, %%xmm0; movdqa %%xmm0, %0;" : "=m" (a[0]) : "m"(b[0]), "m"(c[0]));
#endif

4
shark.cpp
View File

@ -96,7 +96,7 @@ template <const byte *sbox, const ArrayOf256Word64s *cbox>
struct SharkProcessAndXorBlock{ // VC60 workaround: problem with template functions
inline SharkProcessAndXorBlock(const word64 *roundKeys, unsigned int rounds, const byte *inBlock, const byte *xorBlock, byte *outBlock)
{
assert(IsAlignedOn(input,GetAlignmentOf<word64>()));
assert(IsAlignedOn(inBlock,GetAlignmentOf<word64>()));
word64 tmp = *(word64 *)(void *)inBlock ^ roundKeys[0];
ByteOrder order = GetNativeByteOrder();
@ -125,7 +125,7 @@ inline SharkProcessAndXorBlock(const word64 *roundKeys, unsigned int rounds, con
(sbox[GETBYTE(tmp, 1)])
(sbox[GETBYTE(tmp, 0)]);
assert(IsAlignedOn(output,GetAlignmentOf<word64>()));
assert(IsAlignedOn(outBlock,GetAlignmentOf<word64>()));
*(word64 *)(void *)outBlock ^= roundKeys[rounds];
}};

14
tea.cpp
View File

@ -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;