Back-off on Hash asserts (GH #652)

The asserts were a little aggressive and caused very noisy Debug runs. The library itself was one of the biggest offenders.

1 files changed, 3 insertions, 2 deletions

diff --git a/keccak.cpp b/keccak.cpp
index cc1771cf..3450dd6a 100644
--- a/keccak.cpp
+++ b/keccak.cpp
@@ -251,8 +251,8 @@ static void KeccakF1600(word64 *state)
 

 void Keccak::Update(const byte *input, size_t length)

 {

-    CRYPTOPP_ASSERT((input && length) || !(input || length));

-    if (!length) { return; }

+    CRYPTOPP_ASSERT(!(input == NULLPTR && length != 0));

+    if (length == 0) { return; }

 

     size_t spaceLeft;

     while (length >= (spaceLeft = r() - m_counter))

@@ -278,6 +278,7 @@ void Keccak::Restart()
 

 void Keccak::TruncatedFinal(byte *hash, size_t size)

 {

+	CRYPTOPP_ASSERT(hash != NULLPTR);

     ThrowIfInvalidTruncatedSize(size);

 

     m_state.BytePtr()[m_counter] ^= 1;