From 5c1de7b5a5676a136e00eb2c2a8fcc18aded5bb9 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Thu, 4 May 2017 19:11:24 -0400 Subject: Add variable block size support to test and benchmarks CRYPTOPP_COVERAGE was added at 9614307ab7f4a4a4 to increase code coverage support. This commit enables additional validation routines when CRYPTOPP_COVERAGE is in effect. --- test.cpp | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'test.cpp') diff --git a/test.cpp b/test.cpp index 72fda0d7..714f70c6 100644 --- a/test.cpp +++ b/test.cpp @@ -25,7 +25,6 @@ #include "stdcpp.h" #include "ossig.h" #include "trap.h" -#include "aria.h" #include "validate.h" #include "bench.h" @@ -181,10 +180,6 @@ int CRYPTOPP_API main(int argc, char *argv[]) _CrtSetDbgFlag( tempflag ); #endif -#if defined(__MWERKS__) && defined(macintosh) - argc = ccommand(&argv); -#endif - try { RegisterFactories(Test::All); @@ -462,7 +457,7 @@ int CRYPTOPP_API main(int argc, char *argv[]) std::cout << "\nstd::exception caught: " << e.what() << std::endl; return -2; } -} // End main() +} // main() void FIPS140_GenerateRandomFiles() { @@ -994,7 +989,7 @@ bool Validate(int alg, bool thorough, const char *seedInput) case 78: result = Test::ValidateHashDRBG(); break; case 79: result = Test::ValidateHmacDRBG(); break; -#if defined(CRYPTOPP_DEBUG) && !defined(CRYPTOPP_IMPORTS) +#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) // http://github.com/weidai11/cryptopp/issues/92 case 9999: result = Test::TestSecBlock(); break; // http://github.com/weidai11/cryptopp/issues/64 -- cgit v1.2.1