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

Cleared -Wparentheses from GCC 5.1

pull/35/head
Jeffrey Walton 2015-07-19 12:00:17 -04:00
parent ef5a8f883c
commit 7c0c1f57d5
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tea.cpp
View File

@ -26,8 +26,8 @@ void TEA::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byt
while (sum != m_limit) while (sum != m_limit)
{ {
sum += DELTA; sum += DELTA;
y += (z << 4) + m_k[0] ^ z + sum ^ (z >> 5) + m_k[1]; y += ((z << 4) + m_k[0]) ^ (z + sum) ^ ((z >> 5) + m_k[1]);
z += (y << 4) + m_k[2] ^ y + sum ^ (y >> 5) + m_k[3]; z += ((y << 4) + m_k[2]) ^ (y + sum) ^ ((y >> 5) + m_k[3]);
} }
Block::Put(xorBlock, outBlock)(y)(z); Block::Put(xorBlock, outBlock)(y)(z);
@ -41,8 +41,8 @@ void TEA::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byt
word32 sum = m_limit; word32 sum = m_limit;
while (sum != 0) while (sum != 0)
{ {
z -= (y << 4) + m_k[2] ^ y + sum ^ (y >> 5) + m_k[3]; z -= ((y << 4) + m_k[2]) ^ (y + sum) ^ ((y >> 5) + m_k[3]);
y -= (z << 4) + m_k[0] ^ z + sum ^ (z >> 5) + m_k[1]; y -= ((z << 4) + m_k[0]) ^ (z + sum) ^ ((z >> 5) + m_k[1]);
sum -= DELTA; sum -= DELTA;
} }
@ -71,9 +71,9 @@ void XTEA::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, by
while (sum != m_limit) while (sum != m_limit)
#endif #endif
{ {
y += (z<<4 ^ z>>5) + z ^ sum + m_k[sum&3]; y += ((z<<4 ^ z>>5) + z) ^ (sum + m_k[sum&3]);
sum += DELTA; sum += DELTA;
z += (y<<4 ^ y>>5) + y ^ sum + m_k[sum>>11 & 3]; z += ((y<<4 ^ y>>5) + y) ^ (sum + m_k[sum>>11 & 3]);
} }
Block::Put(xorBlock, outBlock)(y)(z); Block::Put(xorBlock, outBlock)(y)(z);
@ -93,15 +93,15 @@ void XTEA::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, by
while (sum != 0) while (sum != 0)
#endif #endif
{ {
z -= (y<<4 ^ y>>5) + y ^ sum + m_k[sum>>11 & 3]; z -= ((y<<4 ^ y>>5) + y) ^ (sum + m_k[sum>>11 & 3]);
sum -= DELTA; sum -= DELTA;
y -= (z<<4 ^ z>>5) + z ^ sum + m_k[sum&3]; y -= ((z<<4 ^ z>>5) + z) ^ (sum + m_k[sum&3]);
} }
Block::Put(xorBlock, outBlock)(y)(z); Block::Put(xorBlock, outBlock)(y)(z);
} }
#define MX (z>>5^y<<2)+(y>>3^z<<4)^(sum^y)+(m_k[p&3^e]^z) #define MX (((z>>5^y<<2)+(y>>3^z<<4))^((sum^y)+(m_k[(p&3)^e]^z)))
void BTEA::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const void BTEA::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byte *outBlock) const
{ {