diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2015-07-19 12:00:17 -0400 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2015-07-19 12:00:17 -0400 |
| commit | 7c0c1f57d55315f6912a99e7db4a06e8086a2402 (patch) | |
| tree | ad95cfeac7a8fa6005b3ffaba0876c4692829ece /tea.cpp | |
| parent | ef5a8f883c4e5d86f55ba50d5b6d9c805d448e69 (diff) | |
| download | cryptopp-git-7c0c1f57d55315f6912a99e7db4a06e8086a2402.tar.gz | |
Cleared -Wparentheses from GCC 5.1
Diffstat (limited to 'tea.cpp')
| -rw-r--r-- | tea.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -26,8 +26,8 @@ void TEA::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, byt while (sum != m_limit) { sum += DELTA; - 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]; + 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]); } 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; while (sum != 0) { - 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]; + 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]); sum -= DELTA; } @@ -71,9 +71,9 @@ void XTEA::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, by while (sum != m_limit) #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; - 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); @@ -93,15 +93,15 @@ void XTEA::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, by while (sum != 0) #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; - 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); } -#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 { |