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

Fix compile error with -DNO_OS_DEPENDENCE 

Whitespace check-in
pull/416/head
Jeffrey Walton 2017-05-06 18:00:57 -04:00
parent 374b8a419f
commit c04b98072c
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 84 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
validat1.cpp
View File

@ -586,7 +586,7 @@ bool TestAutoSeeded()
if(prng.CanIncorporateEntropy()) if(prng.CanIncorporateEntropy())
{ {
SecByteBlock entropy(ENTROPY_SIZE); SecByteBlock entropy(ENTROPY_SIZE);
OS_GenerateRandomBlock(false, entropy, entropy.SizeInBytes()); GlobalRNG().GenerateBlock(entropy, entropy.SizeInBytes());
prng.IncorporateEntropy(entropy, entropy.SizeInBytes()); prng.IncorporateEntropy(entropy, entropy.SizeInBytes());
prng.IncorporateEntropy(entropy, entropy.SizeInBytes()); prng.IncorporateEntropy(entropy, entropy.SizeInBytes());
@ -674,7 +674,7 @@ bool TestAutoSeededX917()
if(prng.CanIncorporateEntropy()) if(prng.CanIncorporateEntropy())
{ {
SecByteBlock entropy(ENTROPY_SIZE); SecByteBlock entropy(ENTROPY_SIZE);
OS_GenerateRandomBlock(false, entropy, entropy.SizeInBytes()); GlobalRNG().GenerateBlock(entropy, entropy.SizeInBytes());
prng.IncorporateEntropy(entropy, entropy.SizeInBytes()); prng.IncorporateEntropy(entropy, entropy.SizeInBytes());
prng.IncorporateEntropy(entropy, entropy.SizeInBytes()); prng.IncorporateEntropy(entropy, entropy.SizeInBytes());
@ -782,7 +782,7 @@ bool TestMersenne()
if(prng.CanIncorporateEntropy()) if(prng.CanIncorporateEntropy())
{ {
SecByteBlock entropy(ENTROPY_SIZE); SecByteBlock entropy(ENTROPY_SIZE);
OS_GenerateRandomBlock(false, entropy, entropy.SizeInBytes()); GlobalRNG().GenerateBlock(entropy, entropy.SizeInBytes());
prng.IncorporateEntropy(entropy, entropy.SizeInBytes()); prng.IncorporateEntropy(entropy, entropy.SizeInBytes());
prng.IncorporateEntropy(entropy, entropy.SizeInBytes()); prng.IncorporateEntropy(entropy, entropy.SizeInBytes());
@ -891,9 +891,6 @@ bool TestRDRAND()
else else
std::cout << "passed:"; std::cout << "passed:";
std::cout << " discarded " << SIZE << " bytes\n"; std::cout << " discarded " << SIZE << " bytes\n";
}
else
std::cout << "\nRDRAND generator not available, skipping test.\n";
try try
{ {
@ -921,6 +918,9 @@ bool TestRDRAND()
else else
std::cout << "passed:"; std::cout << "passed:";
std::cout << " GenerateWord32 and Crop\n"; std::cout << " GenerateWord32 and Crop\n";
}
else
std::cout << "\nRDRAND generator not available, skipping test.\n";
return entropy && compress && discard && crop; return entropy && compress && discard && crop;
} }
@ -988,9 +988,6 @@ bool TestRDSEED()
else else
std::cout << "passed:"; std::cout << "passed:";
std::cout << " discarded " << SIZE << " bytes\n"; std::cout << " discarded " << SIZE << " bytes\n";
}
else
std::cout << "\nRDSEED generator not available, skipping test.\n";
try try
{ {
@ -1018,6 +1015,9 @@ bool TestRDSEED()
else else
std::cout << "passed:"; std::cout << "passed:";
std::cout << " GenerateWord32 and Crop\n"; std::cout << " GenerateWord32 and Crop\n";
}
else
std::cout << "\nRDSEED generator not available, skipping test.\n";
return entropy && compress && discard; return entropy && compress && discard;
} }
@ -2728,43 +2728,43 @@ bool ValidateBaseCode()
std::cout << "\nBase64, Base64URL, Base32 and Base16 coding validation suite running...\n\n"; std::cout << "\nBase64, Base64URL, Base32 and Base16 coding validation suite running...\n\n";
fail = !TestFilter(HexEncoder().Ref(), data, 255, (const byte *)hexEncoded, strlen(hexEncoded)); fail = !TestFilter(HexEncoder().Ref(), data, 255, (const byte *)hexEncoded, strlen(hexEncoded));
std::cout << (fail ? "FAILED " : "passed "); std::cout << (fail ? "FAILED:" : "passed:");
std::cout << "Hex Encoding\n"; std::cout << " Hex Encoding\n";
pass = pass && !fail; pass = pass && !fail;
fail = !TestFilter(HexDecoder().Ref(), (const byte *)hexEncoded, strlen(hexEncoded), data, 255); fail = !TestFilter(HexDecoder().Ref(), (const byte *)hexEncoded, strlen(hexEncoded), data, 255);
std::cout << (fail ? "FAILED " : "passed "); std::cout << (fail ? "FAILED:" : "passed:");
std::cout << "Hex Decoding\n"; std::cout << " Hex Decoding\n";
pass = pass && !fail; pass = pass && !fail;
fail = !TestFilter(Base32Encoder().Ref(), data, 255, (const byte *)base32Encoded, strlen(base32Encoded)); fail = !TestFilter(Base32Encoder().Ref(), data, 255, (const byte *)base32Encoded, strlen(base32Encoded));
std::cout << (fail ? "FAILED " : "passed "); std::cout << (fail ? "FAILED:" : "passed:");
std::cout << "Base32 Encoding\n"; std::cout << " Base32 Encoding\n";
pass = pass && !fail; pass = pass && !fail;
fail = !TestFilter(Base32Decoder().Ref(), (const byte *)base32Encoded, strlen(base32Encoded), data, 255); fail = !TestFilter(Base32Decoder().Ref(), (const byte *)base32Encoded, strlen(base32Encoded), data, 255);
std::cout << (fail ? "FAILED " : "passed "); std::cout << (fail ? "FAILED:" : "passed:");
std::cout << "Base32 Decoding\n"; std::cout << " Base32 Decoding\n";
pass = pass && !fail; pass = pass && !fail;
fail = !TestFilter(Base64Encoder(new HexEncoder).Ref(), data, 255, (const byte *)base64AndHexEncoded, strlen(base64AndHexEncoded)); fail = !TestFilter(Base64Encoder(new HexEncoder).Ref(), data, 255, (const byte *)base64AndHexEncoded, strlen(base64AndHexEncoded));
std::cout << (fail ? "FAILED " : "passed "); std::cout << (fail ? "FAILED:" : "passed:");
std::cout << "Base64 Encoding\n"; std::cout << " Base64 Encoding\n";
pass = pass && !fail; pass = pass && !fail;
fail = !TestFilter(HexDecoder(new Base64Decoder).Ref(), (const byte *)base64AndHexEncoded, strlen(base64AndHexEncoded), data, 255); fail = !TestFilter(HexDecoder(new Base64Decoder).Ref(), (const byte *)base64AndHexEncoded, strlen(base64AndHexEncoded), data, 255);
std::cout << (fail ? "FAILED " : "passed "); std::cout << (fail ? "FAILED:" : "passed:");
std::cout << "Base64 Decoding\n"; std::cout << " Base64 Decoding\n";
pass = pass && !fail; pass = pass && !fail;
fail = !TestFilter(Base64URLEncoder(new HexEncoder).Ref(), data, 255, (const byte *)base64URLAndHexEncoded, strlen(base64URLAndHexEncoded)); fail = !TestFilter(Base64URLEncoder(new HexEncoder).Ref(), data, 255, (const byte *)base64URLAndHexEncoded, strlen(base64URLAndHexEncoded));
std::cout << (fail ? "FAILED " : "passed "); std::cout << (fail ? "FAILED:" : "passed:");
std::cout << "Base64 URL Encoding\n"; std::cout << " Base64 URL Encoding\n";
pass = pass && !fail; pass = pass && !fail;
fail = !TestFilter(HexDecoder(new Base64URLDecoder).Ref(), (const byte *)base64URLAndHexEncoded, strlen(base64URLAndHexEncoded), data, 255); fail = !TestFilter(HexDecoder(new Base64URLDecoder).Ref(), (const byte *)base64URLAndHexEncoded, strlen(base64URLAndHexEncoded), data, 255);
std::cout << (fail ? "FAILED " : "passed "); std::cout << (fail ? "FAILED:" : "passed:");
std::cout << "Base64 URL Decoding\n"; std::cout << " Base64 URL Decoding\n";
pass = pass && !fail; pass = pass && !fail;
return pass; return pass;