add HMAC/SHA2 test vectors

fix cosmetic issues with test suite


git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@517 57ff6487-cd31-0410-9ec3-f628ee90f5f0

1 files changed, 1 insertions, 43 deletions

diff --git a/validat3.cpp b/validat3.cpp
index e2e7ecc..035b556 100644
--- a/validat3.cpp
+++ b/validat3.cpp
@@ -321,15 +321,11 @@ bool ValidateHAVAL()
 
 bool ValidatePanama()
 {
-	cout << "\nPanama validation suite running...\n";
-
 	return RunTestDataFile("TestVectors/panama.txt");
 }
 
 bool ValidateWhirlpool()
 {
-	cout << "\nWhirlpool Hash Function validation suite running...\n";
-
 	return RunTestDataFile("TestVectors/whrlpool.txt");
 }
 
@@ -397,45 +393,7 @@ bool ValidateMD5MAC()
 
 bool ValidateHMAC()
 {
-	typedef HMAC<Weak::MD5> HMAC_MD5;
-
-	const char* keys[]=
-	{
-		"\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b\x0b",
-		"Jefe",
-		"\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA",
-		"\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
-			"\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
-			"\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
-			"\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
-			"\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA"
-	};
-
-	HashTestTuple testSet[] = 
-	{
-		HashTestTuple("Hi There", "\x92\x94\x72\x7a\x36\x38\xbb\x1c\x13\xf4\x8e\xf8\x15\x8b\xfc\x9d"),
-		HashTestTuple("what do ya want for nothing?", "\x75\x0c\x78\x3e\x6a\xb0\xb5\x03\xea\xa8\x6e\x31\x0a\x5d\xb7\x38"),
-		HashTestTuple("\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD\xDD",
-			"\x56\xbe\x34\x52\x1d\x14\x4c\x88\xdb\xb8\xc7\x33\xf0\xe8\xb3\xf6"),
-		HashTestTuple("Test Using Larger Than Block-Size Key - Hash Key First", "\x6b\x1a\xb7\xfe\x4b\xd7\xbf\x8f\x0b\x62\xe6\xce\x61\xb9\xd0\xcd")
-	};
-
-	bool pass=true;
-
-	cout << "\nHMAC/MD5 validation suite running...\n";
-
-	for (int k=0; k<4; k++)
-	{
-		HMAC_MD5 mac((byte *)keys[k], strlen(keys[k]));
-		cout << "\nKEY: ";
-		for (int j=0; keys[k][j] != 0; j++)
-			cout << setw(2) << setfill('0') << hex << (int)(byte)keys[k][j];
-		cout << endl;
-
-		pass = HashModuleTest(mac, testSet+k, 1) && pass;
-	}
-
-	return pass;
+	return RunTestDataFile("TestVectors/hmac.txt");
 }
 
 #ifdef CRYPTOPP_REMOVED