From 7b64ca489a7e1da36b02b4a35d149275914d8268 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sun, 26 Jul 2015 15:51:16 -0400 Subject: [PATCH] Added "trap.h" include for header and source files that assert --- adler32.cpp | 1 + algebra.cpp | 1 + asn.cpp | 1 + asn.h | 1 + authenc.cpp | 1 + authenc.h | 1 + basecode.cpp | 1 + cast.cpp | 1 + ccm.cpp | 1 + cmac.cpp | 1 + cryptlib.cpp | 1 + cryptlib.h | 1 + datatest.cpp | 1 + dlltest.cpp | 1 + eax.cpp | 1 + ec2n.cpp | 1 + ecp.cpp | 1 + emsa2.cpp | 1 + eprecomp.cpp | 1 + esign.cpp | 1 + files.cpp | 1 + filters.cpp | 2 ++ filters.h | 2 ++ fips140.cpp | 1 + fipsalgt.cpp | 1 + fipstest.cpp | 2 ++ fltrimpl.h | 2 ++ gf2_32.cpp | 1 + gf2n.cpp | 1 + gfpcrypt.cpp | 1 + gfpcrypt.h | 1 + hkdf.h | 1 + hmac.cpp | 1 + hrtimer.cpp | 2 ++ ida.cpp | 5 +++-- idea.cpp | 1 + integer.cpp | 1 + iterhash.cpp | 1 + luc.h | 1 + misc.cpp | 2 ++ modes.cpp | 3 ++- modes.h | 1 + nbtheory.cpp | 1 + network.cpp | 1 + panama.cpp | 1 + pkcspad.cpp | 2 +- polynomi.cpp | 1 + pssr.cpp | 2 ++ pubkey.h | 2 ++ pwdbased.h | 1 + queue.cpp | 1 + rijndael.cpp | 1 + rsa.cpp | 1 + rw.cpp | 5 +---- salsa.cpp | 1 + seal.cpp | 1 + simple.h | 1 + smartptr.h | 2 ++ socketft.cpp | 1 + socketft.h | 1 + sosemanuk.cpp | 1 + strciphr.cpp | 1 + strciphr.h | 1 + validat1.cpp | 1 + validat2.cpp | 1 + validat3.cpp | 4 +++- vmac.cpp | 1 + wait.cpp | 1 + winpipes.cpp | 1 + winpipes.h | 2 ++ xtr.cpp | 2 +- xtr.h | 1 + zinflate.cpp | 1 + zinflate.h | 2 ++ 74 files changed, 90 insertions(+), 10 deletions(-) diff --git a/adler32.cpp b/adler32.cpp index 0d52c083..916fc704 100644 --- a/adler32.cpp +++ b/adler32.cpp @@ -2,6 +2,7 @@ #include "pch.h" #include "adler32.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/algebra.cpp b/algebra.cpp index d46543db..9e5222d9 100644 --- a/algebra.cpp +++ b/algebra.cpp @@ -7,6 +7,7 @@ #include "algebra.h" #include "integer.h" +#include "trap.h" #include diff --git a/asn.cpp b/asn.cpp index 45c7d6d9..7f650dc2 100644 --- a/asn.cpp +++ b/asn.cpp @@ -5,6 +5,7 @@ #ifndef CRYPTOPP_IMPORTS #include "asn.h" +#include "trap.h" #include #include diff --git a/asn.h b/asn.h index c35126bc..14da1366 100644 --- a/asn.h +++ b/asn.h @@ -3,6 +3,7 @@ #include "filters.h" #include "queue.h" +#include "trap.h" #include NAMESPACE_BEGIN(CryptoPP) diff --git a/authenc.cpp b/authenc.cpp index 0ca5da60..1e0392ef 100644 --- a/authenc.cpp +++ b/authenc.cpp @@ -5,6 +5,7 @@ #ifndef CRYPTOPP_IMPORTS #include "authenc.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/authenc.h b/authenc.h index f726716e..94c3675a 100644 --- a/authenc.h +++ b/authenc.h @@ -3,6 +3,7 @@ #include "cryptlib.h" #include "secblock.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/basecode.cpp b/basecode.cpp index 62f9ee87..864b5f9f 100644 --- a/basecode.cpp +++ b/basecode.cpp @@ -6,6 +6,7 @@ #include "basecode.h" #include "fltrimpl.h" +#include "trap.h" #include #if GCC_DIAGNOSTIC_AWARE diff --git a/cast.cpp b/cast.cpp index 539923da..b083cd33 100644 --- a/cast.cpp +++ b/cast.cpp @@ -4,6 +4,7 @@ #include "pch.h" #include "cast.h" #include "misc.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/ccm.cpp b/ccm.cpp index 03687871..8b0751fc 100644 --- a/ccm.cpp +++ b/ccm.cpp @@ -5,6 +5,7 @@ #ifndef CRYPTOPP_IMPORTS #include "ccm.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/cmac.cpp b/cmac.cpp index e8fa6fea..5de39ca2 100644 --- a/cmac.cpp +++ b/cmac.cpp @@ -5,6 +5,7 @@ #ifndef CRYPTOPP_IMPORTS #include "cmac.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/cryptlib.cpp b/cryptlib.cpp index a9ed2905..e7dfd6e4 100644 --- a/cryptlib.cpp +++ b/cryptlib.cpp @@ -13,6 +13,7 @@ #include "fltrimpl.h" #include "trdlocal.h" #include "osrng.h" +#include "trap.h" #include diff --git a/cryptlib.h b/cryptlib.h index 93a2015a..a53d6841 100644 --- a/cryptlib.h +++ b/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__)) diff --git a/datatest.cpp b/datatest.cpp index 31ed1e4d..a6be37e9 100644 --- a/datatest.cpp +++ b/datatest.cpp @@ -7,6 +7,7 @@ #include "trunhash.h" #include "queue.h" #include "validate.h" +#include "trap.h" #include #include diff --git a/dlltest.cpp b/dlltest.cpp index 4afd305b..50bf494d 100644 --- a/dlltest.cpp +++ b/dlltest.cpp @@ -3,6 +3,7 @@ #endif #include "dll.h" +#include "trap.h" USING_NAMESPACE(CryptoPP) USING_NAMESPACE(std) diff --git a/eax.cpp b/eax.cpp index cf836632..ff0eeee0 100644 --- a/eax.cpp +++ b/eax.cpp @@ -2,6 +2,7 @@ #include "pch.h" #include "eax.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/ec2n.cpp b/ec2n.cpp index b513b2cb..2e113804 100644 --- a/ec2n.cpp +++ b/ec2n.cpp @@ -9,6 +9,7 @@ #include "algebra.cpp" #include "eprecomp.cpp" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/ecp.cpp b/ecp.cpp index b78d9e4f..10cff341 100644 --- a/ecp.cpp +++ b/ecp.cpp @@ -9,6 +9,7 @@ #include "nbtheory.h" #include "algebra.cpp" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/emsa2.cpp b/emsa2.cpp index 3dbb7e8c..07f7dcf1 100644 --- a/emsa2.cpp +++ b/emsa2.cpp @@ -2,6 +2,7 @@ #include "pch.h" #include "emsa2.h" +#include "trap.h" #ifndef CRYPTOPP_IMPORTS diff --git a/eprecomp.cpp b/eprecomp.cpp index a061cf6c..ecc6ce70 100644 --- a/eprecomp.cpp +++ b/eprecomp.cpp @@ -6,6 +6,7 @@ #include "eprecomp.h" #include "asn.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/esign.cpp b/esign.cpp index f6a526c8..8ac050bf 100644 --- a/esign.cpp +++ b/esign.cpp @@ -7,6 +7,7 @@ #include "nbtheory.h" #include "sha.h" #include "algparam.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/files.cpp b/files.cpp index 453b5624..f0bd67f1 100644 --- a/files.cpp +++ b/files.cpp @@ -5,6 +5,7 @@ #ifndef CRYPTOPP_IMPORTS #include "files.h" +#include "trap.h" #include diff --git a/filters.cpp b/filters.cpp index 04c3bb6e..1b46127f 100644 --- a/filters.cpp +++ b/filters.cpp @@ -8,6 +8,8 @@ #include "mqueue.h" #include "fltrimpl.h" #include "argnames.h" +#include "trap.h" + #include #include diff --git a/filters.h b/filters.h index 4e5d9431..110c3fc7 100644 --- a/filters.h +++ b/filters.h @@ -9,6 +9,8 @@ #include "smartptr.h" #include "queue.h" #include "algparam.h" +#include "trap.h" + #include NAMESPACE_BEGIN(CryptoPP) diff --git a/fips140.cpp b/fips140.cpp index 17e91eee..447e70c0 100644 --- a/fips140.cpp +++ b/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 diff --git a/fipsalgt.cpp b/fipsalgt.cpp index 46ab0e0c..88597023 100644 --- a/fipsalgt.cpp +++ b/fipsalgt.cpp @@ -9,6 +9,7 @@ #endif #include "dll.h" #include "oids.h" +#include "trap.h" USING_NAMESPACE(CryptoPP) USING_NAMESPACE(std) diff --git a/fipstest.cpp b/fipstest.cpp index de9ed725..93a238ab 100644 --- a/fipstest.cpp +++ b/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 #if GCC_DIAGNOSTIC_AWARE diff --git a/fltrimpl.h b/fltrimpl.h index 4087d7d9..2ddac508 100644 --- a/fltrimpl.h +++ b/fltrimpl.h @@ -1,6 +1,8 @@ #ifndef CRYPTOPP_FLTRIMPL_H #define CRYPTOPP_FLTRIMPL_H +#include "trap.h" + #define FILTER_BEGIN \ switch (m_continueAt) \ { \ diff --git a/gf2_32.cpp b/gf2_32.cpp index ae4874a4..88381ca0 100644 --- a/gf2_32.cpp +++ b/gf2_32.cpp @@ -3,6 +3,7 @@ #include "pch.h" #include "misc.h" #include "gf2_32.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/gf2n.cpp b/gf2n.cpp index bcc56071..a46ca1d0 100644 --- a/gf2n.cpp +++ b/gf2n.cpp @@ -10,6 +10,7 @@ #include "randpool.h" #include "asn.h" #include "oids.h" +#include "trap.h" #include diff --git a/gfpcrypt.cpp b/gfpcrypt.cpp index e293fc59..e51756fc 100644 --- a/gfpcrypt.cpp +++ b/gfpcrypt.cpp @@ -8,6 +8,7 @@ #include "asn.h" #include "oids.h" #include "nbtheory.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/gfpcrypt.h b/gfpcrypt.h index 2e6549ef..72bbcefc 100644 --- a/gfpcrypt.h +++ b/gfpcrypt.h @@ -12,6 +12,7 @@ #include "asn.h" #include "smartptr.h" #include "hmac.h" +#include "trap.h" #include diff --git a/hkdf.h b/hkdf.h index 3a5df13b..97e4a7e5 100644 --- a/hkdf.h +++ b/hkdf.h @@ -7,6 +7,7 @@ #include "hmac.h" #include "hrtimer.h" #include "secblock.h" +#include "trap.h" #include diff --git a/hmac.cpp b/hmac.cpp index d4a649c0..a30e4394 100644 --- a/hmac.cpp +++ b/hmac.cpp @@ -5,6 +5,7 @@ #ifndef CRYPTOPP_IMPORTS #include "hmac.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/hrtimer.cpp b/hrtimer.cpp index daa497a6..637dc689 100644 --- a/hrtimer.cpp +++ b/hrtimer.cpp @@ -3,6 +3,8 @@ #include "pch.h" #include "hrtimer.h" #include "misc.h" +#include "trap.h" + #include // for NULL #include diff --git a/ida.cpp b/ida.cpp index a20685b2..932c9992 100644 --- a/ida.cpp +++ b/ida.cpp @@ -6,9 +6,10 @@ #include "algebra.h" #include "gf2_32.h" #include "polynomi.h" -#include - #include "polynomi.cpp" +#include "trap.h" + +#include ANONYMOUS_NAMESPACE_BEGIN static const CryptoPP::GF2_32 field; diff --git a/idea.cpp b/idea.cpp index 5b958a9e..e24ee4b5 100644 --- a/idea.cpp +++ b/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" diff --git a/integer.cpp b/integer.cpp index 6da90e7e..ccd3a596 100644 --- a/integer.cpp +++ b/integer.cpp @@ -15,6 +15,7 @@ #include "pubkey.h" // for P1363_KDF2 #include "sha.h" #include "cpu.h" +#include "trap.h" #include diff --git a/iterhash.cpp b/iterhash.cpp index bc2f4fdf..192b286c 100644 --- a/iterhash.cpp +++ b/iterhash.cpp @@ -6,6 +6,7 @@ #include "iterhash.h" #include "misc.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/luc.h b/luc.h index b065b8ed..54e41326 100644 --- a/luc.h +++ b/luc.h @@ -8,6 +8,7 @@ #include "oaep.h" #include "integer.h" #include "dh.h" +#include "trap.h" #include diff --git a/misc.cpp b/misc.cpp index 92b7bf2f..6d14822c 100644 --- a/misc.cpp +++ b/misc.cpp @@ -6,6 +6,8 @@ #include "misc.h" #include "words.h" +#include "trap.h" + #include #if defined(CRYPTOPP_MEMALIGN_AVAILABLE) || defined(CRYPTOPP_MM_MALLOC_AVAILABLE) || defined(QNX) diff --git a/modes.cpp b/modes.cpp index 57c38a12..3c841bdf 100644 --- a/modes.cpp +++ b/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) diff --git a/modes.h b/modes.h index c0c30c47..9edf53af 100644 --- a/modes.h +++ b/modes.h @@ -10,6 +10,7 @@ #include "strciphr.h" #include "argnames.h" #include "algparam.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/nbtheory.cpp b/nbtheory.cpp index 28c35678..e95aa366 100644 --- a/nbtheory.cpp +++ b/nbtheory.cpp @@ -8,6 +8,7 @@ #include "modarith.h" #include "algparam.h" #include "misc.h" +#include "trap.h" #include #include diff --git a/network.cpp b/network.cpp index aecf29ca..a75cca75 100644 --- a/network.cpp +++ b/network.cpp @@ -3,6 +3,7 @@ #include "pch.h" #include "network.h" #include "wait.h" +#include "trap.h" #define CRYPTOPP_TRACE_NETWORK 0 diff --git a/panama.cpp b/panama.cpp index 0dd41f69..5638078d 100644 --- a/panama.cpp +++ b/panama.cpp @@ -9,6 +9,7 @@ #include "panama.h" #include "misc.h" #include "cpu.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/pkcspad.cpp b/pkcspad.cpp index e1f1d1e2..4f6e62be 100644 --- a/pkcspad.cpp +++ b/pkcspad.cpp @@ -6,7 +6,7 @@ #define CRYPTOPP_PKCSPAD_CPP #include "pkcspad.h" -#include +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/polynomi.cpp b/polynomi.cpp index 734cae92..cbf4fc9c 100644 --- a/polynomi.cpp +++ b/polynomi.cpp @@ -6,6 +6,7 @@ #include "pch.h" #include "polynomi.h" #include "secblock.h" +#include "trap.h" #include #include diff --git a/pssr.cpp b/pssr.cpp index b9698407..1637ba70 100644 --- a/pssr.cpp +++ b/pssr.cpp @@ -2,6 +2,8 @@ #include "pch.h" #include "pssr.h" +#include "trap.h" + #include NAMESPACE_BEGIN(CryptoPP) diff --git a/pubkey.h b/pubkey.h index 478097f5..205a080d 100644 --- a/pubkey.h +++ b/pubkey.h @@ -37,6 +37,8 @@ #include "eprecomp.h" #include "fips140.h" #include "argnames.h" +#include "trap.h" + #include // VC60 workaround: this macro is defined in shlobj.h and conflicts with a template parameter used in this file diff --git a/pwdbased.h b/pwdbased.h index f755724b..bbc8bdff 100644 --- a/pwdbased.h +++ b/pwdbased.h @@ -7,6 +7,7 @@ #include "hmac.h" #include "hrtimer.h" #include "integer.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/queue.cpp b/queue.cpp index 752945f6..42ccd971 100644 --- a/queue.cpp +++ b/queue.cpp @@ -6,6 +6,7 @@ #include "queue.h" #include "filters.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/rijndael.cpp b/rijndael.cpp index cc4720ad..ec2d62a2 100644 --- a/rijndael.cpp +++ b/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 diff --git a/rsa.cpp b/rsa.cpp index 795ec61d..07d78ff1 100644 --- a/rsa.cpp +++ b/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" diff --git a/rw.cpp b/rw.cpp index c0985b10..5cc0de9a 100644 --- a/rw.cpp +++ b/rw.cpp @@ -4,10 +4,7 @@ #include "rw.h" #include "nbtheory.h" #include "asn.h" - -#ifndef NDEBUG -# include -#endif +#include "trap.h" #ifndef CRYPTOPP_IMPORTS diff --git a/salsa.cpp b/salsa.cpp index bd29e374..6fe1e2ff 100644 --- a/salsa.cpp +++ b/salsa.cpp @@ -10,6 +10,7 @@ #include "misc.h" #include "argnames.h" #include "cpu.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/seal.cpp b/seal.cpp index f49b5220..8f81f06d 100644 --- a/seal.cpp +++ b/seal.cpp @@ -6,6 +6,7 @@ #include "seal.h" #include "sha.h" #include "misc.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/simple.h b/simple.h index 926ae5f6..56e648dd 100644 --- a/simple.h +++ b/simple.h @@ -8,6 +8,7 @@ #include "cryptlib.h" #include "misc.h" +#include "trap.h" #if GCC_DIAGNOSTIC_AWARE # pragma GCC diagnostic push diff --git a/smartptr.h b/smartptr.h index 4945783b..21987cce 100644 --- a/smartptr.h +++ b/smartptr.h @@ -2,6 +2,8 @@ #define CRYPTOPP_SMARTPTR_H #include "config.h" +#include "trap.h" + #include NAMESPACE_BEGIN(CryptoPP) diff --git a/socketft.cpp b/socketft.cpp index 4303a41d..fb79169c 100644 --- a/socketft.cpp +++ b/socketft.cpp @@ -2,6 +2,7 @@ #include "pch.h" #include "socketft.h" +#include "trap.h" #ifdef SOCKETS_AVAILABLE diff --git a/socketft.h b/socketft.h index e414aa68..188d7d6f 100644 --- a/socketft.h +++ b/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_) diff --git a/sosemanuk.cpp b/sosemanuk.cpp index d6579e78..1bb06dcb 100644 --- a/sosemanuk.cpp +++ b/sosemanuk.cpp @@ -9,6 +9,7 @@ #include "sosemanuk.h" #include "misc.h" #include "cpu.h" +#include "trap.h" #include "serpentp.h" diff --git a/strciphr.cpp b/strciphr.cpp index 53e00737..39f4d152 100644 --- a/strciphr.cpp +++ b/strciphr.cpp @@ -5,6 +5,7 @@ #ifndef CRYPTOPP_IMPORTS #include "strciphr.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/strciphr.h b/strciphr.h index 6c66a855..aed4af2c 100644 --- a/strciphr.h +++ b/strciphr.h @@ -31,6 +31,7 @@ #include "seckey.h" #include "secblock.h" #include "argnames.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/validat1.cpp b/validat1.cpp index 30c64c35..da1756a3 100644 --- a/validat1.cpp +++ b/validat1.cpp @@ -36,6 +36,7 @@ #include "osrng.h" #include "zdeflate.h" #include "cpu.h" +#include "trap.h" #include #include diff --git a/validat2.cpp b/validat2.cpp index 47c7100d..ea722ccb 100644 --- a/validat2.cpp +++ b/validat2.cpp @@ -26,6 +26,7 @@ #include "oids.h" #include "esign.h" #include "osrng.h" +#include "trap.h" #include #include diff --git a/validat3.cpp b/validat3.cpp index c26f225c..1258af19 100644 --- a/validat3.cpp +++ b/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 #include +#include "validate.h" + USING_NAMESPACE(CryptoPP) USING_NAMESPACE(std) diff --git a/vmac.cpp b/vmac.cpp index 9054fc67..24673b2a 100644 --- a/vmac.cpp +++ b/vmac.cpp @@ -5,6 +5,7 @@ #include "vmac.h" #include "argnames.h" #include "cpu.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/wait.cpp b/wait.cpp index cb78c215..a71cef8e 100644 --- a/wait.cpp +++ b/wait.cpp @@ -3,6 +3,7 @@ #include "pch.h" #include "wait.h" #include "misc.h" +#include "trap.h" #ifdef SOCKETS_AVAILABLE diff --git a/winpipes.cpp b/winpipes.cpp index 1c2e047b..c24219a1 100644 --- a/winpipes.cpp +++ b/winpipes.cpp @@ -6,6 +6,7 @@ #ifdef WINDOWS_PIPES_AVAILABLE #include "wait.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/winpipes.h b/winpipes.h index ade93bbd..7f06135b 100644 --- a/winpipes.h +++ b/winpipes.h @@ -7,6 +7,8 @@ #include "network.h" #include "queue.h" +#include "trap.h" + #include NAMESPACE_BEGIN(CryptoPP) diff --git a/xtr.cpp b/xtr.cpp index 3cf8d97f..9d36e14c 100644 --- a/xtr.cpp +++ b/xtr.cpp @@ -4,8 +4,8 @@ #include "xtr.h" #include "misc.h" #include "nbtheory.h" - #include "algebra.cpp" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/xtr.h b/xtr.h index 89d39f03..9bb0af4f 100644 --- a/xtr.h +++ b/xtr.h @@ -6,6 +6,7 @@ */ #include "modarith.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/zinflate.cpp b/zinflate.cpp index 072ca267..e3fbdc57 100644 --- a/zinflate.cpp +++ b/zinflate.cpp @@ -7,6 +7,7 @@ #include "pch.h" #include "zinflate.h" +#include "trap.h" NAMESPACE_BEGIN(CryptoPP) diff --git a/zinflate.h b/zinflate.h index 7e1225bf..c1b19c63 100644 --- a/zinflate.h +++ b/zinflate.h @@ -2,6 +2,8 @@ #define CRYPTOPP_ZINFLATE_H #include "filters.h" +#include "trap.h" + #include NAMESPACE_BEGIN(CryptoPP)