Split regtest2.cpp into two files

Rename regtest3.cpp to regtest4.cpp. Split regtest2.cpp into regtest2.cpp and regtest3.cpp

Filelist.txt

@@ -254,6 +254,7 @@ rdtables.cpp
 regtest1.cpp
 regtest2.cpp
 regtest3.cpp
+regtest4.cpp
 resource.h
 rijndael.cpp
 rijndael-simd.cpp

GNUmakefile

@@ -749,7 +749,7 @@ OBJS := $(SRCS:.cpp=.o)
 OBJS := $(OBJS:.S=.o)
 
 # List test.cpp first to tame C++ static initialization problems.
-TESTSRCS := adhoc.cpp test.cpp bench1.cpp bench2.cpp bench3.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp validat4.cpp datatest.cpp regtest1.cpp regtest2.cpp regtest3.cpp dlltest.cpp fipsalgt.cpp
+TESTSRCS := adhoc.cpp test.cpp bench1.cpp bench2.cpp bench3.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp validat4.cpp datatest.cpp regtest1.cpp regtest2.cpp regtest3.cpp regtest4.cpp dlltest.cpp fipsalgt.cpp
 TESTINCL := bench.h factory.h validate.h
 
 # Test objects

GNUmakefile-cross

@@ -337,7 +337,7 @@ OBJS := $(SRCS:.cpp=.o)
 OBJS := $(OBJS:.S=.o)
 
 # List test.cpp first to tame C++ static initialization problems.
-TESTSRCS := adhoc.cpp test.cpp bench1.cpp bench2.cpp bench3.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp validat4.cpp datatest.cpp regtest1.cpp regtest2.cpp regtest3.cpp dlltest.cpp fipsalgt.cpp
+TESTSRCS := adhoc.cpp test.cpp bench1.cpp bench2.cpp bench3.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp validat4.cpp datatest.cpp regtest1.cpp regtest2.cpp regtest3.cpp regtest4.cpp dlltest.cpp fipsalgt.cpp
 TESTINCL := bench.h factory.h validate.h
 
 # Test objects

cryptest.nmake

@@ -51,9 +51,9 @@ LIB_SRCS = cryptlib.cpp cpu.cpp integer.cpp 3way.cpp adler32.cpp algebra.cpp alg
 
 LIB_OBJS = cryptlib.obj cpu.obj integer.obj 3way.obj adler32.obj algebra.obj algparam.obj arc4.obj aria-simd.obj aria.obj ariatab.obj asn.obj authenc.obj base32.obj base64.obj basecode.obj bfinit.obj blake2-simd.obj blake2.obj blowfish.obj blumshub.obj camellia.obj cast.obj casts.obj cbcmac.obj ccm.obj chacha.obj cham.obj cham-simd.obj channels.obj cmac.obj crc-simd.obj crc.obj default.obj des.obj dessp.obj dh.obj dh2.obj dll.obj dsa.obj eax.obj ec2n.obj eccrypto.obj ecp.obj elgamal.obj emsa2.obj eprecomp.obj esign.obj files.obj filters.obj fips140.obj fipstest.obj gcm-simd.obj gcm.obj gf256.obj gf2_32.obj gf2n.obj gfpcrypt.obj gost.obj gzip.obj hc128.obj hc256.obj hex.obj hight.obj hmac.obj hrtimer.obj ida.obj idea.obj iterhash.obj kalyna.obj kalynatab.obj keccak.obj lea.obj lea-simd.obj luc.obj mars.obj marss.obj md2.obj md4.obj md5.obj misc.obj modes.obj mqueue.obj mqv.obj nbtheory.obj neon-simd.obj network.obj oaep.obj osrng.obj padlkrng.obj panama.obj pkcspad.obj poly1305.obj polynomi.obj pssr.obj pubkey.obj queue.obj rabin.obj randpool.obj rabbit.obj rc2.obj rc5.obj rc6.obj rdrand.obj rdtables.obj rijndael-simd.obj rijndael.obj ripemd.obj rng.obj rsa.obj rw.obj safer.obj salsa.obj scrypt.obj seal.obj seed.obj serpent.obj sha-simd.obj sha.obj sha3.obj shacal2-simd.obj shacal2.obj shark.obj sharkbox.obj simeck-simd.obj simeck.obj simon.obj simon-simd.obj skipjack.obj sm3.obj sm4.obj sm4-simd.obj socketft.obj sosemanuk.obj speck.obj speck-simd.obj square.obj squaretb.obj sse-simd.obj strciphr.obj tea.obj tftables.obj threefish.obj tiger.obj tigertab.obj trdlocal.obj ttmac.obj tweetnacl.obj twofish.obj vmac.obj wait.obj wake.obj whrlpool.obj winpipes.obj xtr.obj xtrcrypt.obj zdeflate.obj zinflate.obj zlib.obj
 
-TEST_SRCS = bench1.cpp bench2.cpp bench3.cpp test.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp validat4.cpp datatest.cpp regtest1.cpp regtest2.cpp regtest3.cpp fipsalgt.cpp dlltest.cpp fipstest.cpp
+TEST_SRCS = bench1.cpp bench2.cpp bench3.cpp test.cpp validat0.cpp validat1.cpp validat2.cpp validat3.cpp validat4.cpp datatest.cpp regtest1.cpp regtest2.cpp regtest3.cpp regtest4.cpp fipsalgt.cpp dlltest.cpp fipstest.cpp
 
-TEST_OBJS = bench1.obj bench2.obj bench3.obj test.obj validat0.obj validat1.obj validat2.obj validat3.obj validat4.obj datatest.obj regtest1.obj regtest2.obj regtest3.obj fipsalgt.obj dlltest.obj fipstest.obj
+TEST_OBJS = bench1.obj bench2.obj bench3.obj test.obj validat0.obj validat1.obj validat2.obj validat3.obj validat4.obj datatest.obj regtest1.obj regtest2.obj regtest3.obj regtest4.obj fipsalgt.obj dlltest.obj fipstest.obj
 
 CXX = cl.exe
 LD = link.exe

cryptest.vcxproj

@@ -209,6 +209,7 @@
     <ClCompile Include="regtest1.cpp" />
     <ClCompile Include="regtest2.cpp" />
     <ClCompile Include="regtest3.cpp" />
+    <ClCompile Include="regtest4.cpp" />
     <ClCompile Include="test.cpp" />
     <ClCompile Include="validat0.cpp" />
     <ClCompile Include="validat1.cpp" />

cryptest.vcxproj.filters

@@ -400,6 +400,9 @@
     <ClCompile Include="regtest3.cpp">
       <Filter>Source Code</Filter>
     </ClCompile>
+    <ClCompile Include="regtest4.cpp">
+      <Filter>Source Code</Filter>
+    </ClCompile>
     <ClCompile Include="test.cpp">
       <Filter>Source Code</Filter>
     </ClCompile>

hkdf.h

@@ -9,6 +9,7 @@
 
 #include "cryptlib.h"
 #include "secblock.h"
+#include "algparam.h"
 #include "hmac.h"
 
 NAMESPACE_BEGIN(CryptoPP)

regtest1.cpp

@@ -18,6 +18,7 @@
 #include "sha.h"
 #include "sha3.h"
 #include "sm3.h"
+#include "hkdf.h"
 #include "tiger.h"
 #include "ripemd.h"
 #include "panama.h"
@@ -45,10 +46,14 @@ USING_NAMESPACE(CryptoPP)
 
 // Unkeyed ciphers
 void RegisterFactories1();
-// Shared key ciphers
+// MAC ciphers
 void RegisterFactories2();
-// Public key ciphers
+// Stream ciphers
 void RegisterFactories3();
+// Block ciphers
+void RegisterFactories4();
+// Public key ciphers
+void RegisterFactories5();
 
 void RegisterFactories(Test::TestClass suites)
 {
@@ -59,14 +64,18 @@ void RegisterFactories(Test::TestClass suites)
 	if ((suites & Test::Unkeyed) == Test::Unkeyed)
 		RegisterFactories1();
 
-	if ((suites & Test::SharedKeyMAC) == Test::SharedKeyMAC ||
-		(suites & Test::SharedKeyStream) == Test::SharedKeyStream ||
-		(suites & Test::SharedKeyBlock) == Test::SharedKeyBlock)
+	if ((suites & Test::SharedKeyMAC) == Test::SharedKeyMAC)
 		RegisterFactories2();
 
-	if ((suites & Test::PublicKey) == Test::PublicKey)
+	if ((suites & Test::SharedKeyStream) == Test::SharedKeyStream)
 		RegisterFactories3();
 
+	if ((suites & Test::SharedKeyBlock) == Test::SharedKeyBlock)
+		RegisterFactories4();
+
+	if ((suites & Test::PublicKey) == Test::PublicKey)
+		RegisterFactories5();
+
 	s_registered = true;
 }
 
@@ -128,4 +137,9 @@ void RegisterFactories1()
 	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)");
+
+	RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<SHA1> >();
+	RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<SHA256> >();
+	RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<SHA512> >();
+	RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<Whirlpool> >();
 }

regtest2.cpp

@@ -8,53 +8,14 @@
 #include "bench.h"
 #include "cpu.h"
 
-#include "modes.h"
-#include "seal.h"
-#include "ttmac.h"
-#include "aria.h"
-#include "hight.h"
-#include "camellia.h"
-#include "shacal2.h"
-#include "tea.h"
-#include "aes.h"
-#include "salsa.h"
-#include "chacha.h"
-#include "vmac.h"
-#include "tiger.h"
-#include "sosemanuk.h"
-#include "rabbit.h"
-#include "hc128.h"
-#include "hc256.h"
-#include "arc4.h"
-#include "ccm.h"
-#include "gcm.h"
-#include "eax.h"
-#include "twofish.h"
-#include "serpent.h"
-#include "cast.h"
-#include "rc6.h"
-#include "mars.h"
-#include "kalyna.h"
-#include "threefish.h"
-#include "cham.h"
-#include "lea.h"
-#include "simeck.h"
-#include "simon.h"
-#include "speck.h"
-#include "sm4.h"
-#include "des.h"
-#include "idea.h"
-#include "rc5.h"
-#include "tea.h"
-#include "skipjack.h"
+// For MAC's
+#include "hmac.h"
 #include "cmac.h"
 #include "dmac.h"
-#include "blowfish.h"
-#include "seed.h"
-#include "wake.h"
-#include "hkdf.h"
+#include "vmac.h"
+#include "ttmac.h"
 
-// For HMAC's
+// Ciphers
 #include "md5.h"
 #include "keccak.h"
 #include "sha.h"
@@ -63,9 +24,24 @@
 #include "ripemd.h"
 #include "poly1305.h"
 #include "siphash.h"
-#include "whrlpool.h"
 #include "panama.h"
 
+// Stream ciphers
+#include "arc4.h"
+#include "seal.h"
+#include "wake.h"
+#include "chacha.h"
+#include "salsa.h"
+#include "rabbit.h"
+#include "hc128.h"
+#include "hc256.h"
+#include "panama.h"
+#include "sosemanuk.h"
+
+// Block for CMAC
+#include "aes.h"
+#include "des.h"
+
 // Aggressive stack checking with VS2005 SP1 and above.
 #if (_MSC_FULL_VER >= 140050727)
 # pragma strict_gs_check (on)
@@ -77,7 +53,7 @@
 
 USING_NAMESPACE(CryptoPP)
 
-// Shared key ciphers
+// MAC ciphers
 void RegisterFactories2()
 {
 	RegisterDefaultFactoryFor<MessageAuthenticationCode, HMAC<Weak::MD5> >();
@@ -100,22 +76,17 @@ void RegisterFactories2()
 	RegisterDefaultFactoryFor<MessageAuthenticationCode, BLAKE2b>();
 	RegisterDefaultFactoryFor<MessageAuthenticationCode, SipHash<2,4> >();
 	RegisterDefaultFactoryFor<MessageAuthenticationCode, SipHash<4,8> >();
+}
 
-	RegisterSymmetricCipherDefaultFactories<SEAL<> >();
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<SHACAL2> >();
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<ARIA> >();
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<HIGHT> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<HIGHT> >();
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Camellia> >();
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<TEA> >();
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<XTEA> >();
+// Stream ciphers
+void RegisterFactories3()
+{
+	RegisterSymmetricCipherDefaultFactories<SEAL<LittleEndian> >();
+	RegisterSymmetricCipherDefaultFactories<WAKE_OFB<LittleEndian> >();
+	RegisterSymmetricCipherDefaultFactories<WAKE_OFB<BigEndian> >();
 	RegisterSymmetricCipherDefaultFactories<PanamaCipher<LittleEndian> >();
 	RegisterSymmetricCipherDefaultFactories<PanamaCipher<BigEndian> >();
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<AES> >();
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<AES> >();
-	RegisterSymmetricCipherDefaultFactories<CFB_Mode<AES> >();
-	RegisterSymmetricCipherDefaultFactories<OFB_Mode<AES> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<AES> >();
+
 	RegisterSymmetricCipherDefaultFactories<Salsa20>();
 	RegisterSymmetricCipherDefaultFactories<XSalsa20>();
 	RegisterSymmetricCipherDefaultFactories<ChaCha8>();
@@ -127,89 +98,5 @@ void RegisterFactories2()
 	RegisterSymmetricCipherDefaultFactories<HC128>();
 	RegisterSymmetricCipherDefaultFactories<HC256>();
 	RegisterSymmetricCipherDefaultFactories<Weak::MARC4>();
-	RegisterSymmetricCipherDefaultFactories<WAKE_OFB<LittleEndian> >();
-	RegisterSymmetricCipherDefaultFactories<WAKE_OFB<BigEndian> >();
-	RegisterSymmetricCipherDefaultFactories<SEAL<LittleEndian> >();
-	RegisterAuthenticatedSymmetricCipherDefaultFactories<CCM<AES> >();
-	RegisterAuthenticatedSymmetricCipherDefaultFactories<GCM<AES> >();
-	RegisterAuthenticatedSymmetricCipherDefaultFactories<EAX<AES> >();
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<ARIA> >();  // For test vectors
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<ARIA> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Camellia> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Twofish> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Serpent> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<CAST256> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<RC6> >();
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<MARS> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<MARS> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<SHACAL2> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<DES> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<DES_XEX3> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<DES_EDE3> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<IDEA> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<RC5> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<TEA> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<XTEA> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<CAST128> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<SKIPJACK> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Blowfish> >();
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<SEED> >();
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<SEED> >();
-
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Kalyna128> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<Kalyna128> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Kalyna256> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<Kalyna256> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Kalyna512> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<Kalyna512> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Kalyna128> >();  // Benchmarks
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Kalyna256> >();  // Benchmarks
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Kalyna512> >();  // Benchmarks
-
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Threefish256> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<Threefish256> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Threefish512> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<Threefish512> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<Threefish1024> >(); // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<Threefish1024> >(); // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Threefish256> >();  // Benchmarks
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Threefish512> >();  // Benchmarks
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<Threefish1024> >(); // Benchmarks
-
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<CHAM64> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<CHAM128> >(); // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<CHAM64> >();  // Benchmarks
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<CHAM128> >(); // Benchmarks
-
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<LEA> >(); // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<LEA> >(); // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<LEA> >(); // Benchmarks
-
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<SIMECK32> >(); // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<SIMECK32> >(); // Benchmarks
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<SIMECK64> >(); // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<SIMECK64> >(); // Benchmarks
-
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<SIMON64> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<SIMON64> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<SIMON128> >(); // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<SIMON128> >(); // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<SIMON64> >();  // Benchmarks
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<SIMON128> >(); // Benchmarks
-
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<SPECK64> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<SPECK64> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<SPECK128> >(); // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<SPECK128> >(); // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<SPECK64> >();  // Benchmarks
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<SPECK128> >(); // Benchmarks
-
-	RegisterSymmetricCipherDefaultFactories<ECB_Mode<SM4> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CBC_Mode<SM4> >();  // Test Vectors
-	RegisterSymmetricCipherDefaultFactories<CTR_Mode<SM4> >();  // Benchmarks
-
-	RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<SHA1> >();
-	RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<SHA256> >();
-	RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<SHA512> >();
-	RegisterDefaultFactoryFor<KeyDerivationFunction, HKDF<Whirlpool> >();
+	RegisterSymmetricCipherDefaultFactories<SEAL<> >();
 }