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, 2 insertions, 2 deletions

diff --git a/gfpcrypt.h b/gfpcrypt.h
index 7fb7ec27..4cdf3b06 100644
--- a/gfpcrypt.h
+++ b/gfpcrypt.h
@@ -193,7 +193,7 @@ public:
 		r %= q;

 		Integer kInv = k.InverseMod(q);

 		s = (kInv * (x*r + e)) % q;

-		assert(!!r && !!s);

+		CRYPTOPP_ASSERT(!!r && !!s);

 	}

 

 	bool Verify(const DL_GroupParameters<T> &params, const DL_PublicKey<T> &publicKey, const Integer &e, const Integer &r, const Integer &s) const

@@ -228,7 +228,7 @@ public:
 		const Integer &q = params.GetSubgroupOrder();

 		r = (r + e) % q;

 		s = (k - x*r) % q;

-		assert(!!r);

+		CRYPTOPP_ASSERT(!!r);

 	}

 

 	bool Verify(const DL_GroupParameters<T> &params, const DL_PublicKey<T> &publicKey, const Integer &e, const Integer &r, const Integer &s) const