arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove HAVAL, MD5MAC, XMACC. add Sosemanuk

pull/2/head
weidai 2007-04-16 00:37:44 +00:00
parent 4f784a84f8
commit ffd84849eb
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
validat1.cpp
View File

@ -33,6 +33,7 @@
#include "camellia.h"
#include "osrng.h"
#include "zdeflate.h"
#include "cpu.h"
#include <stdlib.h>
#include <time.h>
@ -56,15 +57,12 @@ bool ValidateAll(bool thorough)
pass=ValidateMD5() && pass;
pass=ValidateSHA() && pass;
pass=ValidateSHA2() && pass;
pass=ValidateHAVAL() && pass;
pass=ValidateTiger() && pass;
pass=ValidateRIPEMD() && pass;
pass=ValidatePanama() && pass;
pass=ValidateWhirlpool() && pass;
pass=ValidateMD5MAC() && pass;
pass=ValidateHMAC() && pass;
pass=ValidateXMACC() && pass;
pass=ValidateTTMAC() && pass;
pass=ValidatePBKDF() && pass;
@ -92,6 +90,7 @@ bool ValidateAll(bool thorough)
pass=ValidateSHACAL2() && pass;
pass=ValidateCamellia() && pass;
pass=ValidateSalsa() && pass;
pass=ValidateSosemanuk() && pass;
pass=ValidateBBS() && pass;
pass=ValidateDH() && pass;
@ -216,6 +215,22 @@ bool TestSettings()
#endif
cout << endl;
bool hasMMX = HasMMX();
bool hasSSE2 = HasSSE2();
bool hasSSSE3 = HasSSSE3();
bool isP4 = IsP4();
int cacheLineSize = GetCacheLineSize();
if ((isP4 && (!hasMMX || !hasSSE2)) || (hasSSE2 && !hasMMX) || (cacheLineSize < 16 || cacheLineSize > 256 || !IsPowerOf2(cacheLineSize)))
{
cout << "FAILED: ";
pass = false;
}
else
cout << "passed: ";
cout << "hasMMX == " << hasMMX << ", hasSSE2 == " << hasSSE2 << ", hasSSSE3 == " << hasSSSE3 << ", isP4 == " << isP4 << ", cacheLineSize == " << cacheLineSize;
if (!pass)
{
cout << "Some critical setting in config.h is in error. Please fix it and recompile." << endl;
@ -260,6 +275,7 @@ bool TestOS_RNG()
cout << "passed:";
cout << " it took " << long(t1) << " seconds to generate " << total << " bytes" << endl;
#if 0 // disable this part. it's causing an unpredictable pause during the validation testing
if (t1 < 2)
{
// that was fast, are we really blocking?
@ -280,9 +296,7 @@ bool TestOS_RNG()
total += 1;
length += 1;
}
// turn off this test because it fails on several systems, including Darwin
// they don't block, or gather entropy too fast?
if (false) // (length > 1024)
if (length > 1024)
{
cout << "FAILED:";
pass = false;
@ -291,6 +305,7 @@ bool TestOS_RNG()
cout << "passed:";
cout << " it generated " << length << " bytes in " << long(time(NULL) - t) << " seconds" << endl;
}
#endif
test.AttachedTransformation()->MessageEnd();
@ -1296,17 +1311,12 @@ bool ValidateCamellia()
{
cout << "\nCamellia validation suite running...\n\n";
#ifdef WORD64_AVAILABLE
bool pass = true;
FileSource valdata("camellia.dat", true, new HexDecoder);
pass = BlockTransformationTest(FixedRoundsCipherFactory<CamelliaEncryption, CamelliaDecryption>(16), valdata, 15) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<CamelliaEncryption, CamelliaDecryption>(24), valdata, 15) && pass;
pass = BlockTransformationTest(FixedRoundsCipherFactory<CamelliaEncryption, CamelliaDecryption>(32), valdata, 15) && pass;
return pass;
#else
cout << "word64 not available, skipping Camellia validation." << endl;
return true;
#endif
}
bool ValidateSalsa()
@ -1315,3 +1325,10 @@ bool ValidateSalsa()
return RunTestDataFile("TestVectors/salsa.txt");
}
bool ValidateSosemanuk()
{
cout << "\nSosemanuk validation suite running...\n";
return RunTestDataFile("TestVectors/sosemanuk.txt");
}

4
validate.h
View File

@ -16,15 +16,12 @@ bool ValidateMD4();
bool ValidateMD5();
bool ValidateSHA();
bool ValidateSHA2();
bool ValidateHAVAL();
bool ValidateTiger();
bool ValidateRIPEMD();
bool ValidatePanama();
bool ValidateWhirlpool();
bool ValidateMD5MAC();
bool ValidateHMAC();
bool ValidateXMACC();
bool ValidateTTMAC();
bool ValidateCipherModes();
@ -53,6 +50,7 @@ bool ValidateSerpent();
bool ValidateSHACAL2();
bool ValidateCamellia();
bool ValidateSalsa();
bool ValidateSosemanuk();
bool ValidateBBS();
bool ValidateDH();