From 95ee8975b4fcc132c839dfa47bd80dbaeee7ed54 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sat, 12 Aug 2017 20:29:33 -0400 Subject: [PATCH] Use blockSize in error message thrown --- gcm.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcm.cpp b/gcm.cpp index 6d389a1b..86a0a3a6 100644 --- a/gcm.cpp +++ b/gcm.cpp @@ -332,7 +332,7 @@ void GCM_Base::SetKeyWithoutResync(const byte *userKey, size_t keylength, const const unsigned int blockSize = blockCipher.BlockSize(); CRYPTOPP_ASSERT(blockSize == REQUIRED_BLOCKSIZE); if (blockSize != REQUIRED_BLOCKSIZE) - throw InvalidArgument(AlgorithmName() + ": block size of underlying block cipher is not 16"); + throw InvalidArgument(AlgorithmName() + ": block size of underlying block cipher is not " + IntToString(blockSize)); int tableSize, i, j, k; @@ -342,6 +342,7 @@ void GCM_Base::SetKeyWithoutResync(const byte *userKey, size_t keylength, const // Avoid "parameter not used" error and suppress Coverity finding (void)params.GetIntValue(Name::TableSize(), tableSize); tableSize = s_clmulTableSizeInBlocks * blockSize; + CRYPTOPP_ASSERT(tableSize > (int)blockSize); } else #elif CRYPTOPP_BOOL_ARM_PMULL_AVAILABLE @@ -350,6 +351,7 @@ void GCM_Base::SetKeyWithoutResync(const byte *userKey, size_t keylength, const // Avoid "parameter not used" error and suppress Coverity finding (void)params.GetIntValue(Name::TableSize(), tableSize); tableSize = s_clmulTableSizeInBlocks * blockSize; + CRYPTOPP_ASSERT(tableSize > (int)blockSize); } else #endif