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

Cleared "signed/unsigned" warning under GCC 4.8 (this may have been a GCC 4.8/Debian-i686 issue because both types were unsigned)

pull/35/head
Jeffrey Walton 2015-07-26 01:09:51 -04:00
parent f36dc3d643
commit 0be4110fe5
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
idea.cpp
View File

@ -11,7 +11,7 @@
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
static const int IDEA_KEYLEN=(6*IDEA::ROUNDS+4); // key schedule length in # of word16s static const unsigned int IDEA_KEYLEN=(6*IDEA::ROUNDS+4); // key schedule length in # of word16s
#define low16(x) ((x)&0xffff) // compiler should be able to optimize this away if word is 16 bits #define low16(x) ((x)&0xffff) // compiler should be able to optimize this away if word is 16 bits
#define high16(x) ((x)>>16) #define high16(x) ((x)>>16)
@ -64,7 +64,7 @@ void IDEA::Base::BuildLogTables()
void IDEA::Base::LookupKeyLogs() void IDEA::Base::LookupKeyLogs()
{ {
IDEA::Word* Z=key; IDEA::Word* Z=key;
int r=ROUNDS; unsigned int r=ROUNDS;
do do
{ {
Z[0] = log[Z[0]]; Z[0] = log[Z[0]];
@ -134,9 +134,10 @@ static inline IDEA::Word AddInv(IDEA::Word x)
void IDEA::Base::DeKey() void IDEA::Base::DeKey()
{ {
FixedSizeSecBlock<IDEA::Word, 6*ROUNDS+4> tempkey; FixedSizeSecBlock<IDEA::Word, 6*ROUNDS+4> tempkey;
size_t i;
for (i=0; i<ROUNDS; i++) // Signed/unsigned warning and GCC 4.8 issue under Debian/i386?
unsigned int i;
for (i=0; i<static_cast<unsigned int>(ROUNDS); i++)
{ {
tempkey[i*6+0] = MulInv(m_key[(ROUNDS-i)*6+0]); tempkey[i*6+0] = MulInv(m_key[(ROUNDS-i)*6+0]);
tempkey[i*6+1] = AddInv(m_key[(ROUNDS-i)*6+1+(i>0)]); tempkey[i*6+1] = AddInv(m_key[(ROUNDS-i)*6+1+(i>0)]);
@ -168,7 +169,9 @@ void IDEA::Base::ProcessAndXorBlock(const byte *inBlock, const byte *xorBlock, b
IDEA::Word x0,x1,x2,x3,t0,t1; IDEA::Word x0,x1,x2,x3,t0,t1;
Block::Get(inBlock)(x0)(x1)(x2)(x3); Block::Get(inBlock)(x0)(x1)(x2)(x3);
for (unsigned int i=0; i<ROUNDS; i++) // Signed/unsigned warning and GCC 4.8 issue under Debian/i386?
unsigned int i;
for (i=0; i<static_cast<unsigned int>(ROUNDS); i++)
{ {
MUL(x0, key[i*6+0]); MUL(x0, key[i*6+0]);
x1 += key[i*6+1]; x1 += key[i*6+1];