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/gf2n.h b/gf2n.h
index 867b7590..bfd19027 100644
--- a/gf2n.h
+++ b/gf2n.h
@@ -286,16 +286,16 @@ public:
 

 	virtual GF2NP * Clone() const {return new GF2NP(*this);}

 	virtual void DEREncode(BufferedTransformation &bt) const

-		{CRYPTOPP_UNUSED(bt); assert(false);}	// no ASN.1 syntax yet for general polynomial basis

+		{CRYPTOPP_UNUSED(bt); CRYPTOPP_ASSERT(false);}	// no ASN.1 syntax yet for general polynomial basis

 

 	void DEREncodeElement(BufferedTransformation &out, const Element &a) const;

 	void BERDecodeElement(BufferedTransformation &in, Element &a) const;

 

 	bool Equal(const Element &a, const Element &b) const

-		{assert(a.Degree() < m_modulus.Degree() && b.Degree() < m_modulus.Degree()); return a.Equals(b);}

+		{CRYPTOPP_ASSERT(a.Degree() < m_modulus.Degree() && b.Degree() < m_modulus.Degree()); return a.Equals(b);}

 

 	bool IsUnit(const Element &a) const

-		{assert(a.Degree() < m_modulus.Degree()); return !!a;}

+		{CRYPTOPP_ASSERT(a.Degree() < m_modulus.Degree()); return !!a;}

 

 	unsigned int MaxElementBitLength() const

 		{return m;}