Add CRYPTOPP_ASSERT (Issue 277, CVE-2016-7420)

trap.h and CRYPTOPP_ASSERT has existed for over a year in Master. We deferred on the cut-over waiting for a minor version bump (5.7). We have to use it now due to CVE-2016-7420

1 files changed, 3 insertions, 3 deletions

diff --git a/fhmqv.h b/fhmqv.h
index 0e9a317b..b5eceb79 100644
--- a/fhmqv.h
+++ b/fhmqv.h
@@ -171,7 +171,7 @@ public:
       }

       else

       {

-        assert(0);

+        CRYPTOPP_ASSERT(0);

         return false;

       }

 

@@ -248,7 +248,7 @@ protected:
   {

     HASH hash;

     size_t idx = 0, req = dlen;

-    size_t blk = std::min(dlen, (size_t)HASH::DIGESTSIZE);

+    size_t blk = STDMIN(dlen, (size_t)HASH::DIGESTSIZE);

 

     if(sigma)

     {

@@ -272,7 +272,7 @@ protected:
       hash.Update(&digest[idx], (size_t)HASH::DIGESTSIZE);

 

       idx += (size_t)HASH::DIGESTSIZE;

-      blk = std::min(req, (size_t)HASH::DIGESTSIZE);

+      blk = STDMIN(req, (size_t)HASH::DIGESTSIZE);

       hash.TruncatedFinal(&digest[idx], blk);

 

       req -= blk;