Split regtest.cpp into regtest{1|2|3}.cpp
regtest.cpp is where ciphers register by name. The library has added a number of ciphers over the last couple of years and the source file has experienced bloat. Most of the ARM and MIPS test borads were suffering Out of Memory (OOM) kills as the compiler processed the source fille and the included header files. This won't stop the OOM kills, but it will help the situation. An early BeagleBoard with 512 MB of RAM is still going to have trouble, but it can be worked around by building with 1 make job as opposed to 2 or 4.pull/402/head
Jeffrey Walton
parent
bae30d6767
commit
bf92cb0039
|
|
@ -1,4 +1,5 @@
|
|||
# Please ensure your changes or patch meets minimum requirements.
|
||||
# Please ensure your changes or patch meets minimum requirements.
|
||||
# The minimum requirements are 2.8.5. They roughly equate to Ubuntu 12.04 LTS
|
||||
# Please do not check in something for 2.8.12 or 3.5.0. To test your changes,
|
||||
# please set up a Ubuntu 12.04 LTS system. Then, manually install Cmake 2.8.5
|
||||
|
|
@ -201,7 +202,7 @@ endif()
|
|||
file(GLOB cryptopp_HEADERS *.h)
|
||||
|
||||
# Test sources. You can use the GNUmakefile to generate the list: `make sources`.
|
||||
file(GLOB cryptopp_SOURCES_TEST test.cpp bench1.cpp bench2.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp adhoc.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp fipstest.cpp)
|
||||
file(GLOB cryptopp_SOURCES_TEST test.cpp bench1.cpp bench2.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp adhoc.cpp datatest.cpp regtest1.cpp regtest2.cpp regtest3.cpp fipsalgt.cpp dlltest.cpp fipstest.cpp)
|
||||
|
||||
# Library sources. You can use the GNUmakefile to generate the list: `make sources`.
|
||||
file(GLOB cryptopp_SOURCES *.cpp)
|
||||
|
|
|
|||
|
|
@ -217,7 +217,9 @@ rdrand.asm
|
|||
rdrand.cpp
|
||||
rdrand.h
|
||||
rdtables.cpp
|
||||
regtest.cpp
|
||||
regtest1.cpp
|
||||
regtest2.cpp
|
||||
regtest3.cpp
|
||||
resource.h
|
||||
rijndael.cpp
|
||||
rijndael.h
|
||||
|
|
@ -385,6 +387,7 @@ TestData/xtrdh342.dat
|
|||
TestVectors/Readme.txt
|
||||
TestVectors/aes.txt
|
||||
TestVectors/all.txt
|
||||
TestVectors/aria.txt
|
||||
TestVectors/blake2.txt
|
||||
TestVectors/blake2b.txt
|
||||
TestVectors/blake2s.txt
|
||||
|
|
|
|||
|
|
@ -482,7 +482,7 @@ endif
|
|||
endif # Nasm
|
||||
|
||||
# List test.cpp first to tame C++ static initialization problems.
|
||||
TESTSRCS := adhoc.cpp test.cpp bench1.cpp bench2.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp
|
||||
TESTSRCS := adhoc.cpp test.cpp bench1.cpp bench2.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp datatest.cpp regtest1.cpp regtest2.cpp regtest3.cpp fipsalgt.cpp dlltest.cpp
|
||||
TESTOBJS := $(TESTSRCS:.cpp=.o)
|
||||
LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS))
|
||||
|
||||
|
|
|
|||
|
|
@ -117,7 +117,7 @@ SRCS := cryptlib.cpp cpu.cpp integer.cpp $(filter-out cryptlib.cpp cpu.cpp integ
|
|||
OBJS := $(SRCS:.cpp=.o)
|
||||
|
||||
# List test.cpp first to tame C++ static initialization problems.
|
||||
TESTSRCS := adhoc.cpp test.cpp bench1.cpp bench2.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp
|
||||
TESTSRCS := adhoc.cpp test.cpp bench1.cpp bench2.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp datatest.cpp regtest1.cpp regtest2.cpp regtest3.cpp fipsalgt.cpp dlltest.cpp
|
||||
TESTOBJS := $(TESTSRCS:.cpp=.o)
|
||||
LIBOBJS := $(filter-out $(TESTOBJS),$(OBJS))
|
||||
|
||||
|
|
|
|||
4
bench.h
4
bench.h
|
|
@ -14,6 +14,8 @@
|
|||
NAMESPACE_BEGIN(CryptoPP)
|
||||
NAMESPACE_BEGIN(Test)
|
||||
|
||||
enum TestClass {Unkeyed=1,SharedKey=2,PublicKey=4, All=Unkeyed|SharedKey|PublicKey};
|
||||
|
||||
extern const double CLOCK_TICKS_PER_SECOND;
|
||||
extern double g_allocatedTime;
|
||||
extern double g_hertz;
|
||||
|
|
@ -26,7 +28,7 @@ extern time_t g_testBegin;
|
|||
extern time_t g_testEnd;
|
||||
|
||||
// Top level, prints preamble and postamble
|
||||
void Benchmark(int suites, double t, double hertz);
|
||||
void Benchmark(Test::TestClass suites, double t, double hertz);
|
||||
// Unkeyed systems
|
||||
void Benchmark1(double t, double hertz);
|
||||
// Shared key systems
|
||||
|
|
|
|||
20
bench1.cpp
20
bench1.cpp
|
|
@ -339,34 +339,34 @@ void AddHtmlFooter()
|
|||
std::cout << "\n</HTML>" << std::endl;
|
||||
}
|
||||
|
||||
void Benchmark(int suites, double t, double hertz)
|
||||
void Benchmark(Test::TestClass suites, double t, double hertz)
|
||||
{
|
||||
g_allocatedTime = t;
|
||||
g_hertz = hertz;
|
||||
|
||||
g_testBegin = std::time(NULLPTR);
|
||||
|
||||
AddHtmlHeader();
|
||||
|
||||
if (suites > 7)
|
||||
suites = 7;
|
||||
g_testBegin = std::time(NULLPTR);
|
||||
|
||||
if (static_cast<int>(suites) > 7 || static_cast<int>(suites) == 0)
|
||||
suites = Test::All;
|
||||
|
||||
// Unkeyed algorithms
|
||||
if (suites & 1)
|
||||
if (suites & Test::Unkeyed)
|
||||
Benchmark1(t, hertz);
|
||||
|
||||
if (suites > 1)
|
||||
if (static_cast<int>(suites) > 1)
|
||||
std::cout << "\n<BR>";
|
||||
|
||||
// Shared key algorithms
|
||||
if (suites & 2)
|
||||
if (suites & Test::SharedKey)
|
||||
Benchmark2(t, hertz);
|
||||
|
||||
if (suites > 2)
|
||||
if (static_cast<int>(suites) > 2)
|
||||
std::cout << "\n<BR>";
|
||||
|
||||
// Public key algorithms
|
||||
if (suites & 4)
|
||||
if (suites & Test::PublicKey)
|
||||
Benchmark3(t, hertz);
|
||||
|
||||
g_testEnd = std::time(NULLPTR);
|
||||
|
|
|
|||
|
|
@ -52,9 +52,9 @@ LIB_SRCS = cryptlib.cpp cpu.cpp integer.cpp shacal2.cpp md5.cpp shark.cpp zinfla
|
|||
|
||||
LIB_OBJS = cryptlib.obj cpu.obj integer.obj shacal2.obj md5.obj shark.obj zinflate.obj gf2n.obj salsa.obj xtr.obj oaep.obj rc2.obj default.obj wait.obj wake.obj twofish.obj iterhash.obj adler32.obj algparam.obj marss.obj blowfish.obj ecp.obj strciphr.obj aria.obj camellia.obj dh2.obj ida.obj zlib.obj elgamal.obj crc.obj dessp.obj tea.obj eax.obj network.obj sha.obj emsa2.obj pkcspad.obj squaretb.obj idea.obj authenc.obj hmac.obj xtrcrypt.obj queue.obj mars.obj rc5.obj md2.obj hrtimer.obj vmac.obj eprecomp.obj hex.obj dsa.obj fips140.obj gzip.obj seal.obj blake2.obj files.obj base32.obj sharkbox.obj safer.obj randpool.obj sosemanuk.obj arc4.obj osrng.obj skipjack.obj seed.obj sha3.obj filters.obj bfinit.obj rabin.obj 3way.obj rw.obj rdtables.obj rsa.obj tftables.obj gost.obj socketft.obj nbtheory.obj panama.obj modes.obj rijndael.obj casts.obj algebra.obj esign.obj gfpcrypt.obj dll.obj ec2n.obj poly1305.obj polynomi.obj blumshub.obj des.obj basecode.obj zdeflate.obj base64.obj rc6.obj gf256.obj mqueue.obj misc.obj pssr.obj channels.obj rng.obj tiger.obj cast.obj square.obj asn.obj chacha.obj whrlpool.obj md4.obj dh.obj ccm.obj mqv.obj tigertab.obj gf2_32.obj cbcmac.obj ttmac.obj luc.obj trdlocal.obj pubkey.obj gcm.obj ripemd.obj keccak.obj eccrypto.obj serpent.obj cmac.obj winpipes.obj
|
||||
|
||||
TEST_SRCS = bench1.cpp bench2.cpp test.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp datatest.cpp regtest.cpp fipsalgt.cpp dlltest.cpp fipstest.cpp
|
||||
TEST_SRCS = bench1.cpp bench2.cpp test.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp datatest.cpp regtest1.cpp regtest2.cpp regtest3.cpp fipsalgt.cpp dlltest.cpp fipstest.cpp
|
||||
|
||||
TEST_OBJS = bench1.obj bench2.obj test.obj validat0.obj validat1.obj validat2.obj validat3.obj datatest.obj regtest.obj fipsalgt.obj dlltest.obj fipstest.obj
|
||||
TEST_OBJS = bench1.obj bench2.obj test.obj validat0.obj validat1.obj validat2.obj validat3.obj datatest.obj regtest1.obj regtest2.obj regtest3.obj fipsalgt.obj dlltest.obj fipstest.obj
|
||||
|
||||
CXX = cl.exe
|
||||
LD = link.exe
|
||||
|
|
|
|||
|
|
@ -199,7 +199,9 @@
|
|||
<ClCompile Include="datatest.cpp" />
|
||||
<ClCompile Include="dlltest.cpp" />
|
||||
<ClCompile Include="fipsalgt.cpp" />
|
||||
<ClCompile Include="regtest.cpp" />
|
||||
<ClCompile Include="regtest1.cpp" />
|
||||
<ClCompile Include="regtest2.cpp" />
|
||||
<ClCompile Include="regtest3.cpp" />
|
||||
<ClCompile Include="test.cpp" />
|
||||
<ClCompile Include="validat0.cpp" />
|
||||
<ClCompile Include="validat1.cpp" />
|
||||
|
|
|
|||
|
|
@ -347,7 +347,13 @@
|
|||
<ClCompile Include="dlltest.cpp">
|
||||
<Filter>Source Code</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="regtest.cpp">
|
||||
<ClCompile Include="regtest1.cpp">
|
||||
<Filter>Source Code</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="regtest2.cpp">
|
||||
<Filter>Source Code</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="regtest3.cpp">
|
||||
<Filter>Source Code</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="test.cpp">
|
||||
|
|
|
|||
|
|
@ -0,0 +1,117 @@
|
|||
// regtest1.cpp - originally written and placed in the public domain by Wei Dai
|
||||
// regtest.cpp split into 3 files due to OOM kills by JW in April 2017
|
||||
|
||||
#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
|
||||
|
||||
#include "cryptlib.h"
|
||||
#include "factory.h"
|
||||
#include "bench.h"
|
||||
#include "cpu.h"
|
||||
|
||||
#include "crc.h"
|
||||
#include "adler32.h"
|
||||
#include "md2.h"
|
||||
#include "md5.h"
|
||||
#include "keccak.h"
|
||||
#include "sha3.h"
|
||||
#include "blake2.h"
|
||||
#include "sha.h"
|
||||
#include "tiger.h"
|
||||
#include "ripemd.h"
|
||||
#include "panama.h"
|
||||
#include "whrlpool.h"
|
||||
|
||||
#include "osrng.h"
|
||||
#include "drbg.h"
|
||||
#include "mersenne.h"
|
||||
#include "rdrand.h"
|
||||
|
||||
#include "modes.h"
|
||||
#include "aes.h"
|
||||
|
||||
// Aggressive stack checking with VS2005 SP1 and above.
|
||||
#if (CRYPTOPP_MSC_VERSION >= 1410)
|
||||
# pragma strict_gs_check (on)
|
||||
#endif
|
||||
|
||||
USING_NAMESPACE(CryptoPP)
|
||||
|
||||
// Unkeyed ciphers
|
||||
void RegisterFactories1();
|
||||
// Shared key ciphers
|
||||
void RegisterFactories2();
|
||||
// Public key ciphers
|
||||
void RegisterFactories3();
|
||||
|
||||
void RegisterFactories(Test::TestClass suites)
|
||||
{
|
||||
static bool s_registered = false;
|
||||
if (s_registered)
|
||||
return;
|
||||
|
||||
if ((suites & Test::Unkeyed) == Test::Unkeyed)
|
||||
RegisterFactories1();
|
||||
|
||||
if ((suites & Test::SharedKey) == Test::SharedKey)
|
||||
RegisterFactories2();
|
||||
|
||||
if ((suites & Test::PublicKey) == Test::PublicKey)
|
||||
RegisterFactories3();
|
||||
|
||||
s_registered = true;
|
||||
}
|
||||
|
||||
// Unkeyed ciphers
|
||||
void RegisterFactories1()
|
||||
{
|
||||
RegisterDefaultFactoryFor<HashTransformation, CRC32>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, CRC32C>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Adler32>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Weak::MD5>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA1>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA224>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA256>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA384>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA512>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Whirlpool>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Tiger>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, RIPEMD160>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, RIPEMD320>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, RIPEMD128>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, RIPEMD256>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Weak::PanamaHash<LittleEndian> >();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Weak::PanamaHash<BigEndian> >();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Keccak_224>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Keccak_256>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Keccak_384>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Keccak_512>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA3_224>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA3_256>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA3_384>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA3_512>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, BLAKE2s>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, BLAKE2b>();
|
||||
|
||||
#ifdef BLOCKING_RNG_AVAILABLE
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, BlockingRng>();
|
||||
#endif
|
||||
#ifdef NONBLOCKING_RNG_AVAILABLE
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, NonblockingRng>();
|
||||
#endif
|
||||
#ifdef OS_RNG_AVAILABLE
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, AutoSeededRandomPool>();
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, AutoSeededX917RNG<AES> >();
|
||||
#endif
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, MT19937>();
|
||||
#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
|
||||
if (HasRDRAND())
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, RDRAND>();
|
||||
if (HasRDSEED())
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, RDSEED>();
|
||||
#endif
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, OFB_Mode<AES>::Encryption >("AES/OFB RNG");
|
||||
RegisterDefaultFactoryFor<NIST_DRBG, Hash_DRBG<SHA1> >("Hash_DRBG(SHA1)");
|
||||
RegisterDefaultFactoryFor<NIST_DRBG, Hash_DRBG<SHA256> >("Hash_DRBG(SHA256)");
|
||||
RegisterDefaultFactoryFor<NIST_DRBG, HMAC_DRBG<SHA1> >("HMAC_DRBG(SHA1)");
|
||||
RegisterDefaultFactoryFor<NIST_DRBG, HMAC_DRBG<SHA256> >("HMAC_DRBG(SHA256)");
|
||||
}
|
||||
|
|
@ -1,34 +1,25 @@
|
|||
// regtest.cpp - originally written and placed in the public domain by Wei Dai
|
||||
// regtest1.cpp - originally written and placed in the public domain by Wei Dai
|
||||
// regtest.cpp split into 3 files due to OOM kills by JW in April 2017
|
||||
|
||||
#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
|
||||
|
||||
#include "cryptlib.h"
|
||||
#include "factory.h"
|
||||
#include "bench.h"
|
||||
#include "cpu.h"
|
||||
|
||||
#include "modes.h"
|
||||
#include "dh.h"
|
||||
#include "esign.h"
|
||||
#include "md2.h"
|
||||
#include "rw.h"
|
||||
#include "md5.h"
|
||||
#include "rsa.h"
|
||||
#include "ripemd.h"
|
||||
#include "dsa.h"
|
||||
#include "seal.h"
|
||||
#include "whrlpool.h"
|
||||
#include "ttmac.h"
|
||||
#include "aria.h"
|
||||
#include "camellia.h"
|
||||
#include "shacal2.h"
|
||||
#include "tea.h"
|
||||
#include "panama.h"
|
||||
#include "pssr.h"
|
||||
#include "aes.h"
|
||||
#include "salsa.h"
|
||||
#include "chacha.h"
|
||||
#include "vmac.h"
|
||||
#include "tiger.h"
|
||||
#include "md5.h"
|
||||
#include "sosemanuk.h"
|
||||
#include "arc4.h"
|
||||
#include "ccm.h"
|
||||
|
|
@ -50,19 +41,19 @@
|
|||
#include "seed.h"
|
||||
#include "wake.h"
|
||||
#include "seal.h"
|
||||
#include "crc.h"
|
||||
#include "adler32.h"
|
||||
#include "hkdf.h"
|
||||
|
||||
// For HMAC's
|
||||
#include "md5.h"
|
||||
#include "keccak.h"
|
||||
#include "sha.h"
|
||||
#include "sha3.h"
|
||||
#include "blake2.h"
|
||||
#include "ripemd.h"
|
||||
#include "poly1305.h"
|
||||
#include "hkdf.h"
|
||||
#include "siphash.h"
|
||||
|
||||
#include "osrng.h"
|
||||
#include "drbg.h"
|
||||
#include "mersenne.h"
|
||||
#include "rdrand.h"
|
||||
#include "whrlpool.h"
|
||||
#include "panama.h"
|
||||
|
||||
// Aggressive stack checking with VS2005 SP1 and above.
|
||||
#if (CRYPTOPP_MSC_VERSION >= 1410)
|
||||
|
|
@ -71,40 +62,9 @@
|
|||
|
||||
USING_NAMESPACE(CryptoPP)
|
||||
|
||||
void RegisterFactories()
|
||||
// Shared key ciphers
|
||||
void RegisterFactories2()
|
||||
{
|
||||
static bool s_registered = false;
|
||||
if (s_registered)
|
||||
return;
|
||||
|
||||
RegisterDefaultFactoryFor<SimpleKeyAgreementDomain, DH>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, CRC32>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, CRC32C>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Adler32>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Weak::MD5>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA1>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA224>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA256>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA384>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA512>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Whirlpool>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Tiger>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, RIPEMD160>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, RIPEMD320>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, RIPEMD128>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, RIPEMD256>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Weak::PanamaHash<LittleEndian> >();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Weak::PanamaHash<BigEndian> >();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Keccak_224>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Keccak_256>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Keccak_384>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, Keccak_512>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA3_224>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA3_256>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA3_384>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, SHA3_512>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, BLAKE2s>();
|
||||
RegisterDefaultFactoryFor<HashTransformation, BLAKE2b>();
|
||||
RegisterDefaultFactoryFor<MessageAuthenticationCode, HMAC<Weak::MD5> >();
|
||||
RegisterDefaultFactoryFor<MessageAuthenticationCode, HMAC<SHA1> >();
|
||||
RegisterDefaultFactoryFor<MessageAuthenticationCode, HMAC<RIPEMD160> >();
|
||||
|
|
@ -125,25 +85,7 @@ void RegisterFactories()
|
|||
RegisterDefaultFactoryFor<MessageAuthenticationCode, BLAKE2b>();
|
||||
RegisterDefaultFactoryFor<MessageAuthenticationCode, SipHash<2,4> >();
|
||||
RegisterDefaultFactoryFor<MessageAuthenticationCode, SipHash<4,8> >();
|
||||
RegisterAsymmetricCipherDefaultFactories<RSAES<OAEP<SHA1> > >("RSA/OAEP-MGF1(SHA-1)");
|
||||
RegisterAsymmetricCipherDefaultFactories<DLIES<> >("DLIES(NoCofactorMultiplication, KDF2(SHA-1), XOR, HMAC(SHA-1), DHAES)");
|
||||
RegisterSignatureSchemeDefaultFactories<DSA>();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA2<SHA224> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA2<SHA256> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA2<SHA384> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA2<SHA512> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA_RFC6979<SHA1> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA_RFC6979<SHA224> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA_RFC6979<SHA256> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA_RFC6979<SHA384> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA_RFC6979<SHA512> >();
|
||||
RegisterSignatureSchemeDefaultFactories<NR<SHA1> >("NR(1363)/EMSA1(SHA-1)");
|
||||
RegisterSignatureSchemeDefaultFactories<GDSA<SHA1> >("DSA-1363/EMSA1(SHA-1)");
|
||||
RegisterSignatureSchemeDefaultFactories<RSASS<PKCS1v15, Weak::MD2> >("RSA/PKCS1-1.5(MD2)");
|
||||
RegisterSignatureSchemeDefaultFactories<RSASS<PKCS1v15, SHA1> >("RSA/PKCS1-1.5(SHA-1)");
|
||||
RegisterSignatureSchemeDefaultFactories<ESIGN<SHA1> >("ESIGN/EMSA5-MGF1(SHA-1)");
|
||||
RegisterSignatureSchemeDefaultFactories<RWSS<P1363_EMSA2, SHA1> >("RW/EMSA2(SHA-1)");
|
||||
RegisterSignatureSchemeDefaultFactories<RSASS<PSS, SHA1> >("RSA/PSS-MGF1(SHA-1)");
|
||||
|
||||
RegisterSymmetricCipherDefaultFactories<SEAL<> >();
|
||||
RegisterSymmetricCipherDefaultFactories<ECB_Mode<SHACAL2> >();
|
||||
RegisterSymmetricCipherDefaultFactories<ECB_Mode<ARIA> >();
|
||||
|
|
@ -192,33 +134,9 @@ void RegisterFactories()
|
|||
RegisterSymmetricCipherDefaultFactories<CTR_Mode<Blowfish> >();
|
||||
RegisterSymmetricCipherDefaultFactories<ECB_Mode<SEED> >();
|
||||
RegisterSymmetricCipherDefaultFactories<CTR_Mode<SEED> >();
|
||||
|
||||
RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<SHA1> >();
|
||||
RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<SHA256> >();
|
||||
RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<SHA512> >();
|
||||
RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<Whirlpool> >();
|
||||
|
||||
#ifdef BLOCKING_RNG_AVAILABLE
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, BlockingRng>();
|
||||
#endif
|
||||
#ifdef NONBLOCKING_RNG_AVAILABLE
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, NonblockingRng>();
|
||||
#endif
|
||||
#ifdef OS_RNG_AVAILABLE
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, AutoSeededRandomPool>();
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, AutoSeededX917RNG<AES> >();
|
||||
#endif
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, MT19937>();
|
||||
#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
|
||||
if (HasRDRAND())
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, RDRAND>();
|
||||
if (HasRDSEED())
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, RDSEED>();
|
||||
#endif
|
||||
RegisterDefaultFactoryFor<RandomNumberGenerator, OFB_Mode<AES>::Encryption >("AES/OFB RNG");
|
||||
RegisterDefaultFactoryFor<NIST_DRBG, Hash_DRBG<SHA1> >("Hash_DRBG(SHA1)");
|
||||
RegisterDefaultFactoryFor<NIST_DRBG, Hash_DRBG<SHA256> >("Hash_DRBG(SHA256)");
|
||||
RegisterDefaultFactoryFor<NIST_DRBG, HMAC_DRBG<SHA1> >("HMAC_DRBG(SHA1)");
|
||||
RegisterDefaultFactoryFor<NIST_DRBG, HMAC_DRBG<SHA256> >("HMAC_DRBG(SHA256)");
|
||||
|
||||
s_registered = true;
|
||||
}
|
||||
|
|
@ -0,0 +1,53 @@
|
|||
// regtest.cpp - originally written and placed in the public domain by Wei Dai
|
||||
// regtest.cpp split into 3 files due to OOM kills by JW in April 2017
|
||||
|
||||
#define CRYPTOPP_ENABLE_NAMESPACE_WEAK 1
|
||||
|
||||
#include "cryptlib.h"
|
||||
#include "factory.h"
|
||||
#include "bench.h"
|
||||
#include "cpu.h"
|
||||
|
||||
#include "dh.h"
|
||||
#include "nr.h"
|
||||
#include "rw.h"
|
||||
#include "rsa.h"
|
||||
#include "dsa.h"
|
||||
#include "pssr.h"
|
||||
#include "esign.h"
|
||||
|
||||
// Hashes
|
||||
#include "md2.h"
|
||||
#include "md5.h"
|
||||
#include "sha.h"
|
||||
|
||||
// Aggressive stack checking with VS2005 SP1 and above.
|
||||
#if (CRYPTOPP_MSC_VERSION >= 1410)
|
||||
# pragma strict_gs_check (on)
|
||||
#endif
|
||||
|
||||
USING_NAMESPACE(CryptoPP)
|
||||
|
||||
void RegisterFactories3()
|
||||
{
|
||||
RegisterDefaultFactoryFor<SimpleKeyAgreementDomain, DH>();
|
||||
RegisterAsymmetricCipherDefaultFactories<RSAES<OAEP<SHA1> > >("RSA/OAEP-MGF1(SHA-1)");
|
||||
RegisterAsymmetricCipherDefaultFactories<DLIES<> >("DLIES(NoCofactorMultiplication, KDF2(SHA-1), XOR, HMAC(SHA-1), DHAES)");
|
||||
RegisterSignatureSchemeDefaultFactories<DSA>();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA2<SHA224> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA2<SHA256> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA2<SHA384> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA2<SHA512> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA_RFC6979<SHA1> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA_RFC6979<SHA224> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA_RFC6979<SHA256> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA_RFC6979<SHA384> >();
|
||||
RegisterSignatureSchemeDefaultFactories<DSA_RFC6979<SHA512> >();
|
||||
RegisterSignatureSchemeDefaultFactories<NR<SHA1> >("NR(1363)/EMSA1(SHA-1)");
|
||||
RegisterSignatureSchemeDefaultFactories<GDSA<SHA1> >("DSA-1363/EMSA1(SHA-1)");
|
||||
RegisterSignatureSchemeDefaultFactories<RSASS<PKCS1v15, Weak::MD2> >("RSA/PKCS1-1.5(MD2)");
|
||||
RegisterSignatureSchemeDefaultFactories<RSASS<PKCS1v15, SHA1> >("RSA/PKCS1-1.5(SHA-1)");
|
||||
RegisterSignatureSchemeDefaultFactories<ESIGN<SHA1> >("ESIGN/EMSA5-MGF1(SHA-1)");
|
||||
RegisterSignatureSchemeDefaultFactories<RWSS<P1363_EMSA2, SHA1> >("RW/EMSA2(SHA-1)");
|
||||
RegisterSignatureSchemeDefaultFactories<RSASS<PSS, SHA1> >("RSA/PSS-MGF1(SHA-1)");
|
||||
}
|
||||
12
test.cpp
12
test.cpp
|
|
@ -71,7 +71,7 @@ USING_NAMESPACE(CryptoPP)
|
|||
|
||||
const int MAX_PHRASE_LENGTH=250;
|
||||
|
||||
void RegisterFactories();
|
||||
void RegisterFactories(Test::TestClass suites);
|
||||
void PrintSeedAndThreads(const std::string& seed);
|
||||
|
||||
void GenerateRSAKey(unsigned int keyLength, const char *privFilename, const char *pubFilename, const char *seed);
|
||||
|
|
@ -187,7 +187,7 @@ int CRYPTOPP_API main(int argc, char *argv[])
|
|||
|
||||
try
|
||||
{
|
||||
RegisterFactories();
|
||||
RegisterFactories(Test::All);
|
||||
|
||||
// Some editors have problems with the '\0' character when redirecting output.
|
||||
std::string seed = IntToString(time(NULLPTR));
|
||||
|
|
@ -405,13 +405,13 @@ int CRYPTOPP_API main(int argc, char *argv[])
|
|||
else if (command == "v" || command == "vv")
|
||||
return !Validate(argc>2 ? Test::StringToValue<int, true>(argv[2]) : 0, argv[1][1] == 'v', argc>3 ? argv[3] : NULLPTR);
|
||||
else if (command == "b") // All benchmarks
|
||||
Test::Benchmark(7, argc<3 ? 1 : Test::StringToValue<float, true>(argv[2]), argc<4 ? 0.0f : Test::StringToValue<float, true>(argv[3])*1e9);
|
||||
Test::Benchmark(Test::All, argc<3 ? 1 : Test::StringToValue<float, true>(argv[2]), argc<4 ? 0.0f : Test::StringToValue<float, true>(argv[3])*1e9);
|
||||
else if (command == "b3") // Public key algorithms
|
||||
Test::Benchmark(4, argc<3 ? 1 : Test::StringToValue<float, true>(argv[2]), argc<4 ? 0.0f : Test::StringToValue<float, true>(argv[3])*1e9);
|
||||
Test::Benchmark(Test::PublicKey, argc<3 ? 1 : Test::StringToValue<float, true>(argv[2]), argc<4 ? 0.0f : Test::StringToValue<float, true>(argv[3])*1e9);
|
||||
else if (command == "b2") // Shared key algorithms
|
||||
Test::Benchmark(2, argc<3 ? 1 : Test::StringToValue<float, true>(argv[2]), argc<4 ? 0.0f : Test::StringToValue<float, true>(argv[3])*1e9);
|
||||
Test::Benchmark(Test::SharedKey, argc<3 ? 1 : Test::StringToValue<float, true>(argv[2]), argc<4 ? 0.0f : Test::StringToValue<float, true>(argv[3])*1e9);
|
||||
else if (command == "b1") // Unkeyed algorithms
|
||||
Test::Benchmark(1, argc<3 ? 1 : Test::StringToValue<float, true>(argv[2]), argc<4 ? 0.0f : Test::StringToValue<float, true>(argv[3])*1e9);
|
||||
Test::Benchmark(Test::Unkeyed, argc<3 ? 1 : Test::StringToValue<float, true>(argv[2]), argc<4 ? 0.0f : Test::StringToValue<float, true>(argv[3])*1e9);
|
||||
else if (command == "z")
|
||||
GzipFile(argv[3], argv[4], argv[2][0]-'0');
|
||||
else if (command == "u")
|
||||
|
|
|
|||
Loading…
Reference in New Issue