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-24 23:40:49 -05:00
parent bf3b80f25c
commit 475c574e5f
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
panama.cpp
View File

@ -326,6 +326,7 @@ void CRYPTOPP_NOINLINE Panama_SSE2_Pull(size_t count, word32 *state, word32 *z,
template <class B> template <class B>
void Panama<B>::Iterate(size_t count, const word32 *p, byte *output, const byte *input, KeystreamOperation operation) void Panama<B>::Iterate(size_t count, const word32 *p, byte *output, const byte *input, KeystreamOperation operation)
{ {
assert(IsAlignedOn(m_state,GetAlignmentOf<word32>()));
word32 bstart = m_state[17]; word32 bstart = m_state[17];
word32 *const aPtr = m_state; word32 *const aPtr = m_state;
word32 cPtr[17]; word32 cPtr[17];
@ -369,11 +370,11 @@ void Panama<B>::Iterate(size_t count, const word32 *p, byte *output, const byte
CRYPTOPP_KEYSTREAM_OUTPUT_SWITCH(PANAMA_OUTPUT, 4*8); CRYPTOPP_KEYSTREAM_OUTPUT_SWITCH(PANAMA_OUTPUT, 4*8);
} }
word32 *const b16 = (word32 *)(bPtr+((bstart+16*32) & 31*32)); word32 *const b16 = (word32 *)(void *)(bPtr+((bstart+16*32) & 31*32));
word32 *const b4 = (word32 *)(bPtr+((bstart+(32-4)*32) & 31*32)); word32 *const b4 = (word32 *)(void *)(bPtr+((bstart+(32-4)*32) & 31*32));
bstart += 32; bstart += 32;
word32 *const b0 = (word32 *)(bPtr+((bstart) & 31*32)); word32 *const b0 = (word32 *)(void *)(bPtr+((bstart) & 31*32));
word32 *const b25 = (word32 *)(bPtr+((bstart+(32-25)*32) & 31*32)); word32 *const b25 = (word32 *)(void *)(bPtr+((bstart+(32-25)*32) & 31*32));
if (p) if (p)
{ {
@ -459,11 +460,13 @@ template <class B>
void PanamaCipherPolicy<B>::CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length) void PanamaCipherPolicy<B>::CipherResynchronize(byte *keystreamBuffer, const byte *iv, size_t length)
{ {
CRYPTOPP_UNUSED(keystreamBuffer); CRYPTOPP_UNUSED(iv); CRYPTOPP_UNUSED(length); CRYPTOPP_UNUSED(keystreamBuffer); CRYPTOPP_UNUSED(iv); CRYPTOPP_UNUSED(length);
assert(IsAlignedOn(iv,GetAlignmentOf<word32>()));
assert(length==32); assert(length==32);
this->Reset(); this->Reset();
this->Iterate(1, m_key); this->Iterate(1, m_key);
if (iv && IsAligned<word32>(iv)) if (iv && IsAligned<word32>(iv))
this->Iterate(1, (const word32 *)iv); this->Iterate(1, (const word32 *)(void *)iv);
else else
{ {
FixedSizeSecBlock<word32, 8> buf; FixedSizeSecBlock<word32, 8> buf;