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

Clear sign compare warning

pull/681/head
Jeffrey Walton 2018-07-01 01:01:36 -04:00
parent 3d29f99af7
commit 011a66d03b
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cham.cpp
View File

@ -133,7 +133,7 @@ void CHAM64::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock,
GetBlock<word16, BigEndian> iblock(inBlock); GetBlock<word16, BigEndian> iblock(inBlock);
iblock(m_x[0])(m_x[1])(m_x[2])(m_x[3]); iblock(m_x[0])(m_x[1])(m_x[2])(m_x[3]);
const unsigned int R = 80; const int R = 80;
for (int i = 0; i < R; i+=16) for (int i = 0; i < R; i+=16)
{ {
CHAM_EncRound< 0, 16>(m_x.begin(), m_rk.begin(), i+0); CHAM_EncRound< 0, 16>(m_x.begin(), m_rk.begin(), i+0);
@ -164,7 +164,7 @@ void CHAM64::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock,
GetBlock<word16, BigEndian> iblock(inBlock); GetBlock<word16, BigEndian> iblock(inBlock);
iblock(m_x[0])(m_x[1])(m_x[2])(m_x[3]); iblock(m_x[0])(m_x[1])(m_x[2])(m_x[3]);
const unsigned int R = 80; const int R = 80;
for (int i = R-1; i >=0 ; i-=16) for (int i = R-1; i >=0 ; i-=16)
{ {
CHAM_DecRound<15, 16>(m_x.begin(), m_rk.begin(), i-0); CHAM_DecRound<15, 16>(m_x.begin(), m_rk.begin(), i-0);
@ -214,7 +214,7 @@ void CHAM128::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock,
{ {
case 4: // 128-bit key case 4: // 128-bit key
{ {
const unsigned int R = 80; const int R = 80;
for (int i = 0; i < R; i+=8) for (int i = 0; i < R; i+=8)
{ {
CHAM_EncRound<0, 8>(m_x.begin(), m_rk.begin(), i+0); CHAM_EncRound<0, 8>(m_x.begin(), m_rk.begin(), i+0);
@ -230,7 +230,7 @@ void CHAM128::Enc::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock,
} }
case 8: // 256-bit key case 8: // 256-bit key
{ {
const unsigned int R = 96; const int R = 96;
for (int i = 0; i < R; i+=16) for (int i = 0; i < R; i+=16)
{ {
CHAM_EncRound< 0, 16>(m_x.begin(), m_rk.begin(), i+0); CHAM_EncRound< 0, 16>(m_x.begin(), m_rk.begin(), i+0);
@ -270,7 +270,7 @@ void CHAM128::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock,
{ {
case 4: // 128-bit key case 4: // 128-bit key
{ {
const unsigned int R = 80; const int R = 80;
for (int i = R-1; i >= 0; i-=8) for (int i = R-1; i >= 0; i-=8)
{ {
CHAM_DecRound<7, 8>(m_x.begin(), m_rk.begin(), i-0); CHAM_DecRound<7, 8>(m_x.begin(), m_rk.begin(), i-0);
@ -286,7 +286,7 @@ void CHAM128::Dec::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock,
} }
case 8: // 256-bit key case 8: // 256-bit key
{ {
const unsigned int R = 96; const int R = 96;
for (int i = R-1; i >= 0; i-=16) for (int i = R-1; i >= 0; i-=16)
{ {
CHAM_DecRound<15, 16>(m_x.begin(), m_rk.begin(), i-0); CHAM_DecRound<15, 16>(m_x.begin(), m_rk.begin(), i-0);