Fix sources after sync with upstream

pull/461/head
Jeffrey Walton 2017-08-14 03:19:20 -04:00
parent c44f32d683
commit a25e63fcb7
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
3 changed files with 495 additions and 1254 deletions

View File

@ -134,7 +134,7 @@ void GCM_Base::SetKeyWithoutResync(const byte *userKey, size_t keylength, const
// Avoid "parameter not used" error and suppress Coverity finding // Avoid "parameter not used" error and suppress Coverity finding
(void)params.GetIntValue(Name::TableSize(), tableSize); (void)params.GetIntValue(Name::TableSize(), tableSize);
tableSize = s_cltableSizeInBlocks * blockSize; tableSize = s_cltableSizeInBlocks * blockSize;
CRYPTOPP_ASSERT(tableSize > blockSize); CRYPTOPP_ASSERT(tableSize > static_cast<int>(blockSize));
} }
else else
#elif CRYPTOPP_ARM_PMULL_AVAILABLE #elif CRYPTOPP_ARM_PMULL_AVAILABLE
@ -143,7 +143,7 @@ void GCM_Base::SetKeyWithoutResync(const byte *userKey, size_t keylength, const
// Avoid "parameter not used" error and suppress Coverity finding // Avoid "parameter not used" error and suppress Coverity finding
(void)params.GetIntValue(Name::TableSize(), tableSize); (void)params.GetIntValue(Name::TableSize(), tableSize);
tableSize = s_cltableSizeInBlocks * blockSize; tableSize = s_cltableSizeInBlocks * blockSize;
CRYPTOPP_ASSERT(tableSize > blockSize); CRYPTOPP_ASSERT(tableSize > static_cast<int>(blockSize));
} }
else else
#endif #endif

File diff suppressed because it is too large Load Diff

917
sha.cpp

File diff suppressed because it is too large Load Diff