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/asn.h b/asn.h
index 8c8ac321..52a184c9 100644
--- a/asn.h
+++ b/asn.h
@@ -239,7 +239,7 @@ public:
 	~BERGeneralDecoder();

 

 	bool IsDefiniteLength() const {return m_definiteLength;}

-	lword RemainingLength() const {assert(m_definiteLength); return m_length;}

+	lword RemainingLength() const {CRYPTOPP_ASSERT(m_definiteLength); return m_length;}

 	bool EndReached() const;

 	byte PeekByte() const;

 	void CheckByte(byte b);

@@ -258,7 +258,7 @@ protected:
 private:

 	void Init(byte asnTag);

 	void StoreInitialize(const NameValuePairs &parameters)

-		{CRYPTOPP_UNUSED(parameters); assert(false);}

+		{CRYPTOPP_UNUSED(parameters); CRYPTOPP_ASSERT(false);}

 	lword ReduceLength(lword delta);

 };