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/simple.h b/simple.h
index 0c181124..afe06c75 100644
--- a/simple.h
+++ b/simple.h
@@ -97,7 +97,7 @@ public:
 	bool Flush(bool completeFlush, int propagation=-1, bool blocking=true)

 		{return ChannelFlush(DEFAULT_CHANNEL, completeFlush, propagation, blocking);}

 	bool IsolatedFlush(bool hardFlush, bool blocking)

-		{CRYPTOPP_UNUSED(hardFlush); CRYPTOPP_UNUSED(blocking); assert(false); return false;}

+		{CRYPTOPP_UNUSED(hardFlush); CRYPTOPP_UNUSED(blocking); CRYPTOPP_ASSERT(false); return false;}

 	bool ChannelFlush(const std::string &channel, bool hardFlush, int propagation=-1, bool blocking=true)

 	{

 		if (hardFlush && !InputBufferIsEmpty())

@@ -167,7 +167,7 @@ public:
 

 private:

 	bool IsolatedFlush(bool hardFlush, bool blocking)

-		{CRYPTOPP_UNUSED(hardFlush); CRYPTOPP_UNUSED(blocking); assert(false); return false;}

+		{CRYPTOPP_UNUSED(hardFlush); CRYPTOPP_UNUSED(blocking); CRYPTOPP_ASSERT(false); return false;}

 };

 

 //! \class CustomSignalPropagation

@@ -182,7 +182,7 @@ public:
 

 private:

 	void IsolatedInitialize(const NameValuePairs &parameters)

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

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

 };

 

 //! \class Multichannel