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

Cleared "signed/unsigned" warning under GCC 4.8

pull/35/head
Jeffrey Walton 2015-07-26 00:18:25 -04:00
parent fe9948e39a
commit c23c02171d
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
default.cpp
View File

@ -15,6 +15,7 @@ NAMESPACE_BEGIN(CryptoPP)
static const unsigned int MASH_ITERATIONS = 200; static const unsigned int MASH_ITERATIONS = 200;
static const unsigned int SALTLENGTH = 8; static const unsigned int SALTLENGTH = 8;
static const unsigned int DIGESTSIZE = DefaultHashModule::DIGESTSIZE;
static const unsigned int BLOCKSIZE = Default_BlockCipher::Encryption::BLOCKSIZE; static const unsigned int BLOCKSIZE = Default_BlockCipher::Encryption::BLOCKSIZE;
static const unsigned int KEYLENGTH = Default_BlockCipher::Encryption::DEFAULT_KEYLENGTH; static const unsigned int KEYLENGTH = Default_BlockCipher::Encryption::DEFAULT_KEYLENGTH;
@ -29,14 +30,14 @@ static void Mash(const byte *in, size_t inLen, byte *out, size_t outLen, int ite
if (BytePrecision(outLen) > 2) if (BytePrecision(outLen) > 2)
throw InvalidArgument("Mash: output legnth too large"); throw InvalidArgument("Mash: output legnth too large");
size_t bufSize = RoundUpToMultipleOf(outLen, (size_t)DefaultHashModule::DIGESTSIZE); size_t bufSize = RoundUpToMultipleOf(outLen, (size_t)DIGESTSIZE);
byte b[2]; byte b[2];
SecByteBlock buf(bufSize); SecByteBlock buf(bufSize);
SecByteBlock outBuf(bufSize); SecByteBlock outBuf(bufSize);
DefaultHashModule hash; DefaultHashModule hash;
unsigned int i; unsigned int i;
for(i=0; i<outLen; i+=DefaultHashModule::DIGESTSIZE) for(i=0; i<outLen; i+=DIGESTSIZE)
{ {
b[0] = (byte) (i >> 8); b[0] = (byte) (i >> 8);
b[1] = (byte) i; b[1] = (byte) i;
@ -48,7 +49,7 @@ static void Mash(const byte *in, size_t inLen, byte *out, size_t outLen, int ite
while (iterations-- > 1) while (iterations-- > 1)
{ {
memcpy(buf, outBuf, bufSize); memcpy(buf, outBuf, bufSize);
for (i=0; i<bufSize; i+=DefaultHashModule::DIGESTSIZE) for (i=0; i<bufSize; i+=DIGESTSIZE)
{ {
b[0] = (byte) (i >> 8); b[0] = (byte) (i >> 8);
b[1] = (byte) i; b[1] = (byte) i;
@ -88,10 +89,10 @@ DefaultEncryptor::DefaultEncryptor(const byte *passphrase, size_t passphraseLeng
void DefaultEncryptor::FirstPut(const byte *) void DefaultEncryptor::FirstPut(const byte *)
{ {
// VC60 workaround: __LINE__ expansion bug // VC60 workaround: __LINE__ expansion bug
CRYPTOPP_COMPILE_ASSERT_INSTANCE(SALTLENGTH <= DefaultHashModule::DIGESTSIZE, 1); CRYPTOPP_COMPILE_ASSERT_INSTANCE(SALTLENGTH <= DIGESTSIZE, 1);
CRYPTOPP_COMPILE_ASSERT_INSTANCE(BLOCKSIZE <= DefaultHashModule::DIGESTSIZE, 2); CRYPTOPP_COMPILE_ASSERT_INSTANCE(BLOCKSIZE <= DIGESTSIZE, 2);
SecByteBlock salt(DefaultHashModule::DIGESTSIZE), keyCheck(DefaultHashModule::DIGESTSIZE); SecByteBlock salt(DIGESTSIZE), keyCheck(DIGESTSIZE);
DefaultHashModule hash; DefaultHashModule hash;
// use hash(passphrase | time | clock) as salt // use hash(passphrase | time | clock) as salt
@ -165,7 +166,7 @@ void DefaultDecryptor::LastPut(const byte *inString, size_t length)
void DefaultDecryptor::CheckKey(const byte *salt, const byte *keyCheck) void DefaultDecryptor::CheckKey(const byte *salt, const byte *keyCheck)
{ {
SecByteBlock check(STDMAX((unsigned int)2*BLOCKSIZE, (unsigned int)DefaultHashModule::DIGESTSIZE)); SecByteBlock check(STDMAX((unsigned int)2*BLOCKSIZE, (unsigned int)DIGESTSIZE));
DefaultHashModule hash; DefaultHashModule hash;
hash.Update(m_passphrase, m_passphrase.size()); hash.Update(m_passphrase, m_passphrase.size());