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/zlib.cpp b/zlib.cpp
index bba4dc8e..12b1f633 100644
--- a/zlib.cpp
+++ b/zlib.cpp
@@ -21,9 +21,9 @@ static const byte FDICT_FLAG = (1 << 5);
 void ZlibCompressor::WritePrestreamHeader()

 {

 	m_adler32.Restart();

-	assert(((GetLog2WindowSize()-8) << 4) <= 255);

+	CRYPTOPP_ASSERT(((GetLog2WindowSize()-8) << 4) <= 255);

 	byte cmf = byte(DEFLATE_METHOD | ((GetLog2WindowSize()-8) << 4));

-	assert((GetCompressionLevel() << 6) <= 255);

+	CRYPTOPP_ASSERT((GetCompressionLevel() << 6) <= 255);

 	byte flags = byte(GetCompressionLevel() << 6);

 	AttachedTransformation()->PutWord16(RoundUpToMultipleOf(word16(cmf*256+flags), word16(31)));

 }