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, 4 insertions, 0 deletions

diff --git a/blake2.cpp b/blake2.cpp
index 0500e7a0..e858f8c7 100644
--- a/blake2.cpp
+++ b/blake2.cpp
@@ -356,6 +356,9 @@ void BLAKE2_Base<W, T_64bit>::Restart(const BLAKE2_ParameterBlock<T_64bit>& bloc
 template <class W, bool T_64bit>

 void BLAKE2_Base<W, T_64bit>::Update(const byte *input, size_t length)

 {

+    CRYPTOPP_ASSERT(input != NULLPTR);

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

+

     State& state = *m_state.data();

     if (state.length + length > BLOCKSIZE)

     {

@@ -390,6 +393,7 @@ void BLAKE2_Base<W, T_64bit>::Update(const byte *input, size_t length)
 template <class W, bool T_64bit>

 void BLAKE2_Base<W, T_64bit>::TruncatedFinal(byte *hash, size_t size)

 {

+    CRYPTOPP_ASSERT(hash != NULLPTR);

     this->ThrowIfInvalidTruncatedSize(size);

 

     // Set last block unconditionally