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

Added additional tests

pull/3/head
Jeffrey Walton 2016-01-03 12:53:46 -05:00
parent f50a515ce0
commit 0c1f7d30ea
2 changed files with 101 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
validat1.cpp
View File

@ -66,6 +66,7 @@ bool ValidateAll(bool thorough)
bool pass=TestSettings(); bool pass=TestSettings();
pass=TestOS_RNG() && pass; pass=TestOS_RNG() && pass;
pass=TestAutoSeeded() && pass; pass=TestAutoSeeded() && pass;
pass=TestAutoSeededX917() && pass;
#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
pass=TestRDRAND() && pass; pass=TestRDRAND() && pass;
@ -890,6 +891,10 @@ bool TestAutoSeeded()
{ {
return true; return true;
} }
bool TestAutoSeededX917()
{
return true;
}
#else #else
bool TestAutoSeeded() bool TestAutoSeeded()
{ {
@ -897,7 +902,8 @@ bool TestAutoSeeded()
cout << "\nTesting AutoSeeded generator...\n\n"; cout << "\nTesting AutoSeeded generator...\n\n";
AutoSeededRandomPool prng; AutoSeededRandomPool prng;
bool generate = true, discard = true; static const unsigned int ENTROPY_SIZE = 32;
bool generate = true, discard = true, incorporate = false;
MeterFilter meter(new Redirector(TheBitBucket())); MeterFilter meter(new Redirector(TheBitBucket()));
RandomNumberSource test(prng, 100000, true, new Deflator(new Redirector(meter))); RandomNumberSource test(prng, 100000, true, new Deflator(new Redirector(meter)));
@ -926,7 +932,96 @@ bool TestAutoSeeded()
cout << "passed:"; cout << "passed:";
cout << " discarded 10000 bytes" << endl; cout << " discarded 10000 bytes" << endl;
return generate && discard; try
{
if(prng.CanIncorporateEntropy())
{
SecByteBlock entropy(ENTROPY_SIZE);
OS_GenerateRandomBlock(false, entropy, entropy.SizeInBytes());
prng.IncorporateEntropy(entropy, entropy.SizeInBytes());
prng.IncorporateEntropy(entropy, entropy.SizeInBytes());
prng.IncorporateEntropy(entropy, entropy.SizeInBytes());
prng.IncorporateEntropy(entropy, entropy.SizeInBytes());
incorporate = true;
}
}
catch(const Exception& /*ex*/)
{
}
if (!incorporate)
cout << "FAILED:";
else
cout << "passed:";
cout << " IncorporateEntropy with " << 4*ENTROPY_SIZE << " bytes" << endl;
return generate && discard && incorporate;
}
bool TestAutoSeededX917()
{
// This tests Auto-Seeding and GenerateIntoBufferedTransformation.
cout << "\nTesting AutoSeeded X917 generator...\n\n";
AutoSeededX917RNG<AES> prng;
static const unsigned int ENTROPY_SIZE = 32;
bool generate = true, discard = true, incorporate = false;
MeterFilter meter(new Redirector(TheBitBucket()));
RandomNumberSource test(prng, 100000, true, new Deflator(new Redirector(meter)));
if (meter.GetTotalBytes() < 100000)
{
cout << "FAILED:";
generate = false;
}
else
cout << "passed:";
cout << " 100000 generated bytes compressed to " << meter.GetTotalBytes() << " bytes by DEFLATE" << endl;
try
{
prng.DiscardBytes(100000);
}
catch(const Exception&)
{
discard = false;
}
if (!discard)
cout << "FAILED:";
else
cout << "passed:";
cout << " discarded 10000 bytes" << endl;
try
{
if(prng.CanIncorporateEntropy())
{
SecByteBlock entropy(ENTROPY_SIZE);
OS_GenerateRandomBlock(false, entropy, entropy.SizeInBytes());
prng.IncorporateEntropy(entropy, entropy.SizeInBytes());
prng.IncorporateEntropy(entropy, entropy.SizeInBytes());
prng.IncorporateEntropy(entropy, entropy.SizeInBytes());
prng.IncorporateEntropy(entropy, entropy.SizeInBytes());
incorporate = true;
}
}
catch(const Exception& /*ex*/)
{
}
if (!incorporate)
cout << "FAILED:";
else
cout << "passed:";
cout << " IncorporateEntropy with " << 4*ENTROPY_SIZE << " bytes" << endl;
return generate && discard && incorporate;
} }
#endif // NO_OS_DEPENDENCE #endif // NO_OS_DEPENDENCE
@ -951,7 +1046,7 @@ bool TestRDRAND()
chsw.AddDefaultRoute(maurer); chsw.AddDefaultRoute(maurer);
RandomNumberSource rns(rdrand, SIZE, true, new Redirector(chsw)); RandomNumberSource rns(rdrand, SIZE, true, new Redirector(chsw));
deflator.Flush(false); deflator.Flush(true);
assert(0 == maurer.BytesNeeded()); assert(0 == maurer.BytesNeeded());
const double mv = maurer.GetTestValue(); const double mv = maurer.GetTestValue();
@ -1028,7 +1123,7 @@ bool TestRDSEED()
chsw.AddDefaultRoute(maurer); chsw.AddDefaultRoute(maurer);
RandomNumberSource rns(rdseed, SIZE, true, new Redirector(chsw)); RandomNumberSource rns(rdseed, SIZE, true, new Redirector(chsw));
deflator.Flush(false); deflator.Flush(true);
assert(0 == maurer.BytesNeeded()); assert(0 == maurer.BytesNeeded());
const double mv = maurer.GetTestValue(); const double mv = maurer.GetTestValue();

1
validate.h
View File

@ -9,6 +9,7 @@ bool ValidateAll(bool thorough);
bool TestSettings(); bool TestSettings();
bool TestOS_RNG(); bool TestOS_RNG();
bool TestAutoSeeded(); bool TestAutoSeeded();
bool TestAutoSeededX917();
#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
bool TestRDRAND(); bool TestRDRAND();