Add SIMON and SPECK to validation suite

test.cpp

@@ -898,8 +898,10 @@ bool Validate(int alg, bool thorough, const char *seedInput)
 	case 83: result = ValidateHashDRBG(); break;
 	case 84: result = ValidateHmacDRBG(); break;
 	case 85: result = ValidateNaCl(); break;
-	case 86: result = ValidateSIMECK(); break;
+	case 86: result = ValidateCHAM(); break;
-	case 87: result = ValidateCHAM(); break;
+	case 87: result = ValidateSIMECK(); break;
+	case 88: result = ValidateSIMON(); break;
+	case 89: result = ValidateSPECK(); break;
 
 #if defined(CRYPTOPP_EXTENDED_VALIDATION)
 	// http://github.com/weidai11/cryptopp/issues/92

validat3.cpp

@@ -145,6 +145,8 @@ bool ValidateAll(bool thorough)
 	pass=ValidateHIGHT() && pass;
 	pass=ValidateLEA() && pass;
 	pass=ValidateSIMECK() && pass;
+	pass=ValidateSIMON() && pass;
+	pass=ValidateSPECK() && pass;
 	pass=ValidateCamellia() && pass;
 	pass=ValidateSalsa() && pass;
 	pass=ValidateSosemanuk() && pass;

validat4.cpp

@@ -1682,6 +1682,20 @@ bool ValidateLEA()
 	return RunTestDataFile(CRYPTOPP_DATA_DIR "TestVectors/lea.txt");
 }
 
+bool ValidateSIMON()
+{
+	std::cout << "\nSIMON validation suite running...\n";
+
+	return RunTestDataFile(CRYPTOPP_DATA_DIR "TestVectors/simon.txt");
+}
+
+bool ValidateSPECK()
+{
+	std::cout << "\nSPECK validation suite running...\n";
+
+	return RunTestDataFile(CRYPTOPP_DATA_DIR "TestVectors/speck.txt");
+}
+
 bool ValidateCamellia()
 {
 	std::cout << "\nCamellia validation suite running...\n\n";

validate.h

@@ -88,6 +88,8 @@ bool ValidateSIMECK();
 bool ValidateCHAM();
 bool ValidateHIGHT();
 bool ValidateLEA();
+bool ValidateSIMON();
+bool ValidateSPECK();
 bool ValidateCamellia();
 
 bool ValidateHC128();