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

Add additional self tests under debug builds

pull/416/head
Jeffrey Walton 2017-05-05 23:16:28 -04:00
parent ac930b084d
commit 02df6ea847
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
4 changed files with 119 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
validat0.cpp
View File

@ -27,7 +27,7 @@
NAMESPACE_BEGIN(CryptoPP) NAMESPACE_BEGIN(CryptoPP)
NAMESPACE_BEGIN(Test) NAMESPACE_BEGIN(Test)
#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) #if defined(CRYPTOPP_EXTENDED_VALIDATION)
bool TestGzip() bool TestGzip()
{ {
std::cout << "\nTesting Gzip and Gunzip...\n\n"; std::cout << "\nTesting Gzip and Gunzip...\n\n";
@ -46,7 +46,13 @@ bool TestGzip()
StringSource(src, true, new Gzip(new StringSink(dest))); StringSource(src, true, new Gzip(new StringSink(dest)));
StringSource(dest, true, new Gunzip(new StringSink(rec))); StringSource(dest, true, new Gunzip(new StringSink(rec)));
if (src != rec) if (src != rec)
throw Exception(Exception::OTHER_ERROR, "Gzip failed a self test"); throw Exception(Exception::OTHER_ERROR, "Gzip failed to decompress stream");
// Tamper
try {
StringSource(dest.substr(0, len-2), true, new Gunzip(new StringSink(rec)));
throw Exception(Exception::OTHER_ERROR, "Gzip failed to detect a truncated stream");
} catch(const Exception&) {}
} }
} }
catch(const Exception&) catch(const Exception&)
@ -105,7 +111,13 @@ bool TestZinflate()
StringSource(src, true, new Deflator(new StringSink(dest))); StringSource(src, true, new Deflator(new StringSink(dest)));
StringSource(dest, true, new Inflator(new StringSink(rec))); StringSource(dest, true, new Inflator(new StringSink(rec)));
if (src != rec) if (src != rec)
throw Exception(Exception::OTHER_ERROR, "Deflate failed a self test"); throw Exception(Exception::OTHER_ERROR, "Deflate failed to decompress stream");
// Tamper
try {
StringSource(dest.substr(0, len-2), true, new Inflator(new StringSink(rec)));
throw Exception(Exception::OTHER_ERROR, "Deflate failed to detect a truncated stream");
} catch(const Exception&) {}
} }
} }
catch(const Exception&) catch(const Exception&)
@ -127,7 +139,7 @@ bool TestZinflate()
} catch(const Exception&) { } } catch(const Exception&) { }
} }
// Unzip random data. See if we can induce a crash // Inflate random data. See if we can induce a crash
for (unsigned int i=0; i<128; i++) for (unsigned int i=0; i<128; i++)
{ {
std::string src, dest; std::string src, dest;
@ -223,6 +235,27 @@ bool TestDefaultEncryptorWithMAC()
StringSource(dest, true, new DefaultDecryptorWithMAC(pwd.c_str(), new StringSink(rec))); StringSource(dest, true, new DefaultDecryptorWithMAC(pwd.c_str(), new StringSink(rec)));
if (src != rec) if (src != rec)
throw Exception(Exception::OTHER_ERROR, "DefaultEncryptorWithMAC failed a self test"); throw Exception(Exception::OTHER_ERROR, "DefaultEncryptorWithMAC failed a self test");
// Tamper. Data format is [SALT][KEYCHECK][ENCRYPTED DATA].
try {
StringSource(dest.substr(0, len-2), true, new Inflator(new StringSink(rec)));
throw Exception(Exception::OTHER_ERROR, "DefaultEncryptorWithMAC failed to detect a truncated stream");
} catch(const Exception&) {}
try {
dest[4] ^= 0x01;
StringSource(dest, true, new Inflator(new StringSink(rec)));
throw Exception(Exception::OTHER_ERROR, "DefaultEncryptorWithMAC failed to detect a tampered salt");
} catch(const Exception&) {}
try {
dest[4] ^= 0x01; dest[20] ^= 0x01; // undo previous tamper
StringSource(dest, true, new Inflator(new StringSink(rec)));
throw Exception(Exception::OTHER_ERROR, "DefaultEncryptorWithMAC failed to detect a tampered keycheck");
} catch(const Exception&) {}
try {
dest[20] ^= 0x01; dest[dest.length()-2] ^= 0x01; // undo previous tamper
StringSource(dest, true, new Inflator(new StringSink(rec)));
throw Exception(Exception::OTHER_ERROR, "DefaultEncryptorWithMAC failed to detect a tampered data");
} catch(const Exception&) {}
} }
} }
catch(const Exception&) catch(const Exception&)
@ -234,7 +267,7 @@ bool TestDefaultEncryptorWithMAC()
std::cout << "passed:"; std::cout << "passed:";
else else
std::cout << "FAILED:"; std::cout << "FAILED:";
std::cout << " 128 default encryptions and decryptions with MAC" << std::endl; std::cout << " 256 default encryptions and decryptions with MAC" << std::endl;
return !fail; return !fail;
} }
@ -301,6 +334,27 @@ bool TestLegacyEncryptorWithMAC()
StringSource(dest, true, new LegacyDecryptorWithMAC(pwd.c_str(), new StringSink(rec))); StringSource(dest, true, new LegacyDecryptorWithMAC(pwd.c_str(), new StringSink(rec)));
if (src != rec) if (src != rec)
throw Exception(Exception::OTHER_ERROR, "LegacyEncryptorWithMAC failed a self test"); throw Exception(Exception::OTHER_ERROR, "LegacyEncryptorWithMAC failed a self test");
// Tamper. Data format is [SALT][KEYCHECK][ENCRYPTED DATA].
try {
StringSource(dest.substr(0, len-2), true, new Inflator(new StringSink(rec)));
throw Exception(Exception::OTHER_ERROR, "LegacyEncryptorWithMAC failed to detect a truncated stream");
} catch(const Exception&) {}
try {
dest[4] ^= 0x01;
StringSource(dest, true, new Inflator(new StringSink(rec)));
throw Exception(Exception::OTHER_ERROR, "LegacyEncryptorWithMAC failed to detect a tampered salt");
} catch(const Exception&) {}
try {
dest[4] ^= 0x01; dest[20] ^= 0x01; // undo previous tamper
StringSource(dest, true, new Inflator(new StringSink(rec)));
throw Exception(Exception::OTHER_ERROR, "LegacyEncryptorWithMAC failed to detect a tampered keycheck");
} catch(const Exception&) {}
try {
dest[20] ^= 0x01; dest[dest.length()-2] ^= 0x01; // undo previous tamper
StringSource(dest, true, new Inflator(new StringSink(rec)));
throw Exception(Exception::OTHER_ERROR, "LegacyEncryptorWithMAC failed to detect a tampered data");
} catch(const Exception&) {}
} }
} }
catch(const Exception&) catch(const Exception&)
@ -763,7 +817,7 @@ bool TestRounding()
} }
#endif #endif
#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) #if defined(CRYPTOPP_EXTENDED_VALIDATION)
struct ASN1_TestTuple struct ASN1_TestTuple
{ {
int disposition; int disposition;
@ -1016,7 +1070,7 @@ bool TestASN1Parse()
} }
#endif #endif
#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) #if defined(CRYPTOPP_EXTENDED_VALIDATION)
bool TestSecBlock() bool TestSecBlock()
{ {
std::cout << "\nTesting SecBlock...\n\n"; std::cout << "\nTesting SecBlock...\n\n";
@ -1981,7 +2035,7 @@ bool TestSecBlock()
} }
#endif #endif
#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) #if defined(CRYPTOPP_EXTENDED_VALIDATION)
bool TestHuffmanCodes() bool TestHuffmanCodes()
{ {
std::cout << "\nTesting Huffman codes...\n\n"; std::cout << "\nTesting Huffman codes...\n\n";
@ -2019,11 +2073,54 @@ bool TestHuffmanCodes()
} }
#endif #endif
#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) #if defined(CRYPTOPP_EXTENDED_VALIDATION)
bool TestIntegerBitops() bool TestIntegerBitops()
{ {
std::cout << "\nTesting Integer bitops...\n\n"; std::cout << "\nTesting Integer operations...\n\n";
bool pass;
// Integer is missing a couple of tests...
try {
Integer x = Integer::Two().Power2(128) / Integer::Zero();
pass=false;
} catch (const Exception&) {
pass=true;
}
if (pass)
std::cout << "passed:";
else
std::cout << "FAILED:";
std::cout << " Integer DivideByZero\n";
// Integer is missing a couple of tests...
try {
// All in range [90, 96] are composite
Integer x = Integer(GlobalRNG(), 90, 96, Integer::PRIME);
pass=false;
} catch (const Exception&) {
pass=true;
}
if (pass)
std::cout << "passed:";
else
std::cout << "FAILED:";
std::cout << " Integer RandomNumberNotFound\n";
// Integer is missing a couple of tests...
try {
// All in range [90, 96] are composite
Integer x = Integer::One().Doubled();
pass=(x == Integer::Two());
} catch (const Exception&) {
pass=false;
}
if (!pass)
std::cout << "FAILED: Integer Doubled\n";
// Now onto the meat and potatoes...
struct Bitops_TestTuple struct Bitops_TestTuple
{ {
// m,n are operands; a,o,x are and,or,xor results // m,n are operands; a,o,x are and,or,xor results

11
validat1.cpp
View File

@ -73,7 +73,7 @@ bool ValidateAll(bool thorough)
pass=TestAutoSeeded() && pass; pass=TestAutoSeeded() && pass;
pass=TestAutoSeededX917() && pass; pass=TestAutoSeededX917() && pass;
// pass=TestSecRandom() && pass; // pass=TestSecRandom() && pass;
#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) #if defined(CRYPTOPP_EXTENDED_VALIDATION)
pass=TestMersenne() && pass; pass=TestMersenne() && pass;
#endif #endif
#if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64) #if (CRYPTOPP_BOOL_X86 || CRYPTOPP_BOOL_X32 || CRYPTOPP_BOOL_X64)
@ -81,7 +81,7 @@ bool ValidateAll(bool thorough)
pass=TestRDSEED() && pass; pass=TestRDSEED() && pass;
#endif #endif
#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) #if defined(CRYPTOPP_EXTENDED_VALIDATION)
// http://github.com/weidai11/cryptopp/issues/92 // http://github.com/weidai11/cryptopp/issues/92
pass=TestSecBlock() && pass; pass=TestSecBlock() && pass;
// http://github.com/weidai11/cryptopp/issues/336 // http://github.com/weidai11/cryptopp/issues/336
@ -159,12 +159,13 @@ bool ValidateAll(bool thorough)
pass=ValidateCamellia() && pass; pass=ValidateCamellia() && pass;
pass=ValidateSalsa() && pass; pass=ValidateSalsa() && pass;
pass=ValidateSosemanuk() && pass; pass=ValidateSosemanuk() && pass;
pass=RunTestDataFile(CRYPTOPP_DATA_DIR "TestVectors/seed.txt") && pass;
pass=RunTestDataFile(CRYPTOPP_DATA_DIR "TestVectors/kalyna.txt") && pass;
pass=ValidateVMAC() && pass; pass=ValidateVMAC() && pass;
pass=ValidateCCM() && pass; pass=ValidateCCM() && pass;
pass=ValidateGCM() && pass; pass=ValidateGCM() && pass;
pass=ValidateCMAC() && pass; pass=ValidateCMAC() && pass;
pass=RunTestDataFile(CRYPTOPP_DATA_DIR "TestVectors/eax.txt") && pass; pass=RunTestDataFile(CRYPTOPP_DATA_DIR "TestVectors/eax.txt") && pass;
pass=RunTestDataFile(CRYPTOPP_DATA_DIR "TestVectors/seed.txt") && pass;
pass=ValidateBBS() && pass; pass=ValidateBBS() && pass;
pass=ValidateDH() && pass; pass=ValidateDH() && pass;
@ -239,7 +240,7 @@ bool TestSettings()
pass = false; pass = false;
} }
#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) #if defined(CRYPTOPP_EXTENDED_VALIDATION)
// App and library versions, http://github.com/weidai11/cryptopp/issues/371 // App and library versions, http://github.com/weidai11/cryptopp/issues/371
const int v1 = LibraryVersion(); const int v1 = LibraryVersion();
const int v2 = HeaderVersion(); const int v2 = HeaderVersion();
@ -623,7 +624,7 @@ bool TestAutoSeededX917()
} }
#endif // NO_OS_DEPENDENCE #endif // NO_OS_DEPENDENCE
#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) #if defined(CRYPTOPP_EXTENDED_VALIDATION)
bool TestMersenne() bool TestMersenne()
{ {
std::cout << "\nTesting Mersenne Twister...\n\n"; std::cout << "\nTesting Mersenne Twister...\n\n";

2
validat2.cpp
View File

@ -793,7 +793,7 @@ bool ValidateBlumGoldwasser()
} }
*/ */
#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) #if defined(CRYPTOPP_EXTENDED_VALIDATION)
// Issue 64: "PolynomialMod2::operator<<=", http://github.com/weidai11/cryptopp/issues/64 // Issue 64: "PolynomialMod2::operator<<=", http://github.com/weidai11/cryptopp/issues/64
bool TestPolynomialMod2() bool TestPolynomialMod2()
{ {

5
validate.h
View File

@ -107,7 +107,12 @@ bool ValidateESIGN();
bool ValidateHashDRBG(); bool ValidateHashDRBG();
bool ValidateHmacDRBG(); bool ValidateHmacDRBG();
// If CRYPTOPP_DEBUG or CRYPTOPP_COVERAGE is in effect, then perform additional tests
#if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS) #if (defined(CRYPTOPP_DEBUG) || defined(CRYPTOPP_COVERAGE)) && !defined(CRYPTOPP_IMPORTS)
# define CRYPTOPP_EXTENDED_VALIDATION 1
#endif
#if defined(CRYPTOPP_EXTENDED_VALIDATION)
// http://github.com/weidai11/cryptopp/issues/92 // http://github.com/weidai11/cryptopp/issues/92
bool TestSecBlock(); bool TestSecBlock();
// http://github.com/weidai11/cryptopp/issues/64 // http://github.com/weidai11/cryptopp/issues/64