Added "trap.h" include for header and source files that assert

adler32.cpp

@@ -2,6 +2,7 @@
 
 #include "pch.h"
 #include "adler32.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

algebra.cpp

@@ -7,6 +7,7 @@
 
 #include "algebra.h"
 #include "integer.h"
+#include "trap.h"
 
 #include <vector>
 

asn.cpp

@@ -5,6 +5,7 @@
 #ifndef CRYPTOPP_IMPORTS
 
 #include "asn.h"
+#include "trap.h"
 
 #include <iomanip>
 #include <time.h>

asn.h

@@ -3,6 +3,7 @@
 
 #include "filters.h"
 #include "queue.h"
+#include "trap.h"
 #include <vector>
 
 NAMESPACE_BEGIN(CryptoPP)

authenc.cpp

@@ -5,6 +5,7 @@
 #ifndef CRYPTOPP_IMPORTS
 
 #include "authenc.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

authenc.h

@@ -3,6 +3,7 @@
 
 #include "cryptlib.h"
 #include "secblock.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

basecode.cpp

@@ -6,6 +6,7 @@
 
 #include "basecode.h"
 #include "fltrimpl.h"
+#include "trap.h"
 #include <ctype.h>
 
 #if GCC_DIAGNOSTIC_AWARE

cast.cpp

@@ -4,6 +4,7 @@
 #include "pch.h"
 #include "cast.h"
 #include "misc.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

ccm.cpp

@@ -5,6 +5,7 @@
 #ifndef CRYPTOPP_IMPORTS
 
 #include "ccm.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

cmac.cpp

@@ -5,6 +5,7 @@
 #ifndef CRYPTOPP_IMPORTS
 
 #include "cmac.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

cryptlib.cpp

@@ -13,6 +13,7 @@
 #include "fltrimpl.h"
 #include "trdlocal.h"
 #include "osrng.h"
+#include "trap.h"
 
 #include <memory>
 

cryptlib.h

@@ -81,6 +81,7 @@ and getting me started with this manual.
 
 #include "config.h"
 #include "stdcpp.h"
+#include "trap.h"
 
 // We can't include "misc.h" due to circular references....
 #define GCC_DIAGNOSTIC_AWARE_X ((__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)) || defined(__clang__))

datatest.cpp

@@ -7,6 +7,7 @@
 #include "trunhash.h"
 #include "queue.h"
 #include "validate.h"
+#include "trap.h"
 #include <iostream>
 #include <memory>
 

dlltest.cpp

@@ -3,6 +3,7 @@
 #endif
 
 #include "dll.h"
+#include "trap.h"
 
 USING_NAMESPACE(CryptoPP)
 USING_NAMESPACE(std)

eax.cpp

@@ -2,6 +2,7 @@
 
 #include "pch.h"
 #include "eax.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

ec2n.cpp

@@ -9,6 +9,7 @@
 
 #include "algebra.cpp"
 #include "eprecomp.cpp"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

ecp.cpp

@@ -9,6 +9,7 @@
 #include "nbtheory.h"
 
 #include "algebra.cpp"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

emsa2.cpp

@@ -2,6 +2,7 @@
 
 #include "pch.h"
 #include "emsa2.h"
+#include "trap.h"
 
 #ifndef CRYPTOPP_IMPORTS
 

eprecomp.cpp

@@ -6,6 +6,7 @@
 
 #include "eprecomp.h"
 #include "asn.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

esign.cpp

@@ -7,6 +7,7 @@
 #include "nbtheory.h"
 #include "sha.h"
 #include "algparam.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

files.cpp

@@ -5,6 +5,7 @@
 #ifndef CRYPTOPP_IMPORTS
 
 #include "files.h"
+#include "trap.h"
 
 #include <limits>
 

filters.cpp

@@ -8,6 +8,8 @@
 #include "mqueue.h"
 #include "fltrimpl.h"
 #include "argnames.h"
+#include "trap.h"
+
 #include <memory>
 #include <functional>
 

filters.h

@@ -9,6 +9,8 @@
 #include "smartptr.h"
 #include "queue.h"
 #include "algparam.h"
+#include "trap.h"
+
 #include <deque>
 
 NAMESPACE_BEGIN(CryptoPP)

fips140.cpp

@@ -6,6 +6,7 @@
 
 #include "fips140.h"
 #include "misc.h"
+#include "trap.h"
 #include "trdlocal.h"	// needs to be included last for cygwin
 
 #if GCC_DIAGNOSTIC_AWARE

fipsalgt.cpp

@@ -9,6 +9,7 @@
 #endif
 #include "dll.h"
 #include "oids.h"
+#include "trap.h"
 
 USING_NAMESPACE(CryptoPP)
 USING_NAMESPACE(std)

fipstest.cpp

@@ -22,6 +22,8 @@ extern "C" {_CRTIMP void __cdecl _CRT_DEBUGGER_HOOK(int);}
 #endif // _MSC_VER
 #endif // CRYPTOPP_WIN32_AVAILABLE
 
+#include "trap.h"
+
 #include <iostream>
 
 #if GCC_DIAGNOSTIC_AWARE

fltrimpl.h

@@ -1,6 +1,8 @@
 #ifndef CRYPTOPP_FLTRIMPL_H
 #define CRYPTOPP_FLTRIMPL_H
 
+#include "trap.h"
+
 #define FILTER_BEGIN	\
 	switch (m_continueAt)	\
 	{	\

gf2_32.cpp

@@ -3,6 +3,7 @@
 #include "pch.h"
 #include "misc.h"
 #include "gf2_32.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

gf2n.cpp

@@ -10,6 +10,7 @@
 #include "randpool.h"
 #include "asn.h"
 #include "oids.h"
+#include "trap.h"
 
 #include <iostream>
 

gfpcrypt.cpp

@@ -8,6 +8,7 @@
 #include "asn.h"
 #include "oids.h"
 #include "nbtheory.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

gfpcrypt.h

@@ -12,6 +12,7 @@
 #include "asn.h"
 #include "smartptr.h"
 #include "hmac.h"
+#include "trap.h"
 
 #include <limits.h>
 

hkdf.h

@@ -7,6 +7,7 @@
 #include "hmac.h"
 #include "hrtimer.h"
 #include "secblock.h"
+#include "trap.h"
 
 #include <cstring>
 

hmac.cpp

@@ -5,6 +5,7 @@
 #ifndef CRYPTOPP_IMPORTS
 
 #include "hmac.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

hrtimer.cpp

@@ -3,6 +3,8 @@
 #include "pch.h"
 #include "hrtimer.h"
 #include "misc.h"
+#include "trap.h"
+
 #include <stddef.h>		// for NULL
 #include <time.h>
 

ida.cpp

@@ -6,9 +6,10 @@
 #include "algebra.h"
 #include "gf2_32.h"
 #include "polynomi.h"
-#include <functional>
-
 #include "polynomi.cpp"
+#include "trap.h"
+
+#include <functional>
 
 ANONYMOUS_NAMESPACE_BEGIN
 static const CryptoPP::GF2_32 field;

idea.cpp

@@ -3,6 +3,7 @@
 #include "pch.h"
 #include "idea.h"
 #include "misc.h"
+#include "trap.h"
 
 #if GCC_DIAGNOSTIC_AWARE
 # pragma GCC diagnostic ignored "-Wunused-value"

integer.cpp

@@ -15,6 +15,7 @@
 #include "pubkey.h"		// for P1363_KDF2
 #include "sha.h"
 #include "cpu.h"
+#include "trap.h"
 
 #include <iostream>
 

iterhash.cpp

@@ -6,6 +6,7 @@
 
 #include "iterhash.h"
 #include "misc.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

luc.h

@@ -8,6 +8,7 @@
 #include "oaep.h"
 #include "integer.h"
 #include "dh.h"
+#include "trap.h"
 
 #include <limits.h>
 

misc.cpp

@@ -6,6 +6,8 @@
 
 #include "misc.h"
 #include "words.h"
+#include "trap.h"
+
 #include <new>
 
 #if defined(CRYPTOPP_MEMALIGN_AVAILABLE) || defined(CRYPTOPP_MM_MALLOC_AVAILABLE) || defined(QNX)

modes.cpp

@@ -5,9 +5,10 @@
 #ifndef CRYPTOPP_IMPORTS
 
 #include "modes.h"
+#include "trap.h"
 
 #ifndef NDEBUG
-#include "des.h"
+# include "des.h"
 #endif
 
 NAMESPACE_BEGIN(CryptoPP)

modes.h

@@ -10,6 +10,7 @@
 #include "strciphr.h"
 #include "argnames.h"
 #include "algparam.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

nbtheory.cpp

@@ -8,6 +8,7 @@
 #include "modarith.h"
 #include "algparam.h"
 #include "misc.h"
+#include "trap.h"
 
 #include <math.h>
 #include <vector>

network.cpp

@@ -3,6 +3,7 @@
 #include "pch.h"
 #include "network.h"
 #include "wait.h"
+#include "trap.h"
 
 #define CRYPTOPP_TRACE_NETWORK 0
 

panama.cpp

@@ -9,6 +9,7 @@
 #include "panama.h"
 #include "misc.h"
 #include "cpu.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

pkcspad.cpp

@@ -6,7 +6,7 @@
 #define CRYPTOPP_PKCSPAD_CPP
 
 #include "pkcspad.h"
-#include <assert.h>
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

polynomi.cpp

@@ -6,6 +6,7 @@
 #include "pch.h"
 #include "polynomi.h"
 #include "secblock.h"
+#include "trap.h"
 
 #include <sstream>
 #include <iostream>

pssr.cpp

@@ -2,6 +2,8 @@
 
 #include "pch.h"
 #include "pssr.h"
+#include "trap.h"
+
 #include <functional>
 
 NAMESPACE_BEGIN(CryptoPP)

pubkey.h

@@ -37,6 +37,8 @@
 #include "eprecomp.h"
 #include "fips140.h"
 #include "argnames.h"
+#include "trap.h"
+
 #include <memory>
 
 // VC60 workaround: this macro is defined in shlobj.h and conflicts with a template parameter used in this file

pwdbased.h

@@ -7,6 +7,7 @@
 #include "hmac.h"
 #include "hrtimer.h"
 #include "integer.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

queue.cpp

@@ -6,6 +6,7 @@
 
 #include "queue.h"
 #include "filters.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

rijndael.cpp

@@ -72,6 +72,7 @@ being unloaded from L1 cache, until that round is finished.
 #include "rijndael.h"
 #include "misc.h"
 #include "cpu.h"
+#include "trap.h"
 
 #if GCC_DIAGNOSTIC_AWARE
 # pragma GCC diagnostic push

rsa.cpp

@@ -9,6 +9,7 @@
 #include "sha.h"
 #include "algparam.h"
 #include "fips140.h"
+#include "trap.h"
 
 #if !defined(NDEBUG) && !defined(CRYPTOPP_IS_DLL)
 #include "pssr.h"

rw.cpp

@@ -4,10 +4,7 @@
 #include "rw.h"
 #include "nbtheory.h"
 #include "asn.h"
-
+#include "trap.h"
-#ifndef NDEBUG
-# include <cassert>
-#endif
 
 #ifndef CRYPTOPP_IMPORTS
 

salsa.cpp

@@ -10,6 +10,7 @@
 #include "misc.h"
 #include "argnames.h"
 #include "cpu.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

seal.cpp

@@ -6,6 +6,7 @@
 #include "seal.h"
 #include "sha.h"
 #include "misc.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

simple.h

@@ -8,6 +8,7 @@
 
 #include "cryptlib.h"
 #include "misc.h"
+#include "trap.h"
 
 #if GCC_DIAGNOSTIC_AWARE
 # pragma GCC diagnostic push

smartptr.h

@@ -2,6 +2,8 @@
 #define CRYPTOPP_SMARTPTR_H
 
 #include "config.h"
+#include "trap.h"
+
 #include <algorithm>
 
 NAMESPACE_BEGIN(CryptoPP)

socketft.cpp

@@ -2,6 +2,7 @@
 
 #include "pch.h"
 #include "socketft.h"
+#include "trap.h"
 
 #ifdef SOCKETS_AVAILABLE
 

socketft.h

@@ -7,6 +7,7 @@
 
 #include "network.h"
 #include "queue.h"
+#include "trap.h"
 
 #ifdef USE_WINDOWS_STYLE_SOCKETS
 #	if defined(_WINSOCKAPI_) && !defined(_WINSOCK2API_)

sosemanuk.cpp

@@ -9,6 +9,7 @@
 #include "sosemanuk.h"
 #include "misc.h"
 #include "cpu.h"
+#include "trap.h"
 
 #include "serpentp.h"
 

strciphr.cpp

@@ -5,6 +5,7 @@
 #ifndef CRYPTOPP_IMPORTS
 
 #include "strciphr.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

strciphr.h

@@ -31,6 +31,7 @@
 #include "seckey.h"
 #include "secblock.h"
 #include "argnames.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

validat1.cpp

@@ -36,6 +36,7 @@
 #include "osrng.h"
 #include "zdeflate.h"
 #include "cpu.h"
+#include "trap.h"
 
 #include <time.h>
 #include <memory>

validat2.cpp

@@ -26,6 +26,7 @@
 #include "oids.h"
 #include "esign.h"
 #include "osrng.h"
+#include "trap.h"
 
 #include <iostream>
 #include <iomanip>

validat3.cpp

@@ -1,7 +1,6 @@
 // validat3.cpp - written and placed in the public domain by Wei Dai
 
 #include "pch.h"
-#include "validate.h"
 
 #define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
 #include "smartptr.h"
@@ -24,10 +23,13 @@
 #include "hex.h"
 #include "misc.h"
 #include "files.h"
+#include "trap.h"
 
 #include <iostream>
 #include <iomanip>
 
+#include "validate.h"
+
 USING_NAMESPACE(CryptoPP)
 USING_NAMESPACE(std)
 

vmac.cpp

@@ -5,6 +5,7 @@
 #include "vmac.h"
 #include "argnames.h"
 #include "cpu.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

wait.cpp

@@ -3,6 +3,7 @@
 #include "pch.h"
 #include "wait.h"
 #include "misc.h"
+#include "trap.h"
 
 #ifdef SOCKETS_AVAILABLE
 

winpipes.cpp

@@ -6,6 +6,7 @@
 #ifdef WINDOWS_PIPES_AVAILABLE
 
 #include "wait.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

winpipes.h

@@ -7,6 +7,8 @@
 
 #include "network.h"
 #include "queue.h"
+#include "trap.h"
+
 #include <winsock2.h>
 
 NAMESPACE_BEGIN(CryptoPP)

xtr.cpp

@@ -4,8 +4,8 @@
 #include "xtr.h"
 #include "misc.h"
 #include "nbtheory.h"
-
 #include "algebra.cpp"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

xtr.h

@@ -6,6 +6,7 @@
 */
 
 #include "modarith.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

zinflate.cpp

@@ -7,6 +7,7 @@
 
 #include "pch.h"
 #include "zinflate.h"
+#include "trap.h"
 
 NAMESPACE_BEGIN(CryptoPP)
 

zinflate.h

@@ -2,6 +2,8 @@
 #define CRYPTOPP_ZINFLATE_H
 
 #include "filters.h"
+#include "trap.h"
+
 #include <vector>
 
 NAMESPACE_BEGIN(CryptoPP)