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/mersenne.h b/mersenne.h
index ca2362b8..5bb78f80 100644
--- a/mersenne.h
+++ b/mersenne.h
@@ -84,7 +84,7 @@ public:
 			case 2: output[1] = CRYPTOPP_GET_BYTE_AS_BYTE(temp, 2); /* fall through */

 			case 1: output[0] = CRYPTOPP_GET_BYTE_AS_BYTE(temp, 3); break;

 

-			default: assert(0); ;;

+			default: CRYPTOPP_ASSERT(0); ;;

 		}

 

 		// Wipe temp

@@ -148,7 +148,7 @@ protected:
 		static const unsigned long magic[2]={0x0UL, K};

 		word32 kk, temp;

 

-		assert(N >= M);

+		CRYPTOPP_ASSERT(N >= M);

 		for (kk=0;kk<N-M;kk++)

 		{

 			temp = (m_state[kk] & 0x80000000)|(m_state[kk+1] & 0x7FFFFFFF);