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

Move some tests from TestIntegerBitops to TestIntegerOps (GH #602)

pull/605/head
Jeffrey Walton 2018-03-25 00:58:11 -04:00
parent ff82b5a886
commit eb0d040786
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 64 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
validat0.cpp
View File

@ -2495,70 +2495,9 @@ bool TestHuffmanCodes()
#if defined(CRYPTOPP_EXTENDED_VALIDATION) #if defined(CRYPTOPP_EXTENDED_VALIDATION)
bool TestIntegerBitops() bool TestIntegerBitops()
{ {
std::cout << "\nTesting Integer operations...\n\n"; std::cout << "\nTesting Integer bit operations...\n\n";
bool pass; 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...
pass=true;
try {
// A run of 71 composites; see http://en.wikipedia.org/wiki/Prime_gap
Integer x = Integer(GlobalRNG(), 31398, 31468, Integer::PRIME);
pass=false;
} catch (const Exception&) { }
if (pass)
std::cout << "passed:";
else
std::cout << "FAILED:";
std::cout << " Integer RandomNumberNotFound\n";
// Carmichael pseudo-primes
pass=true;
if (IsPrime(Integer("561")))
pass = false;
if (IsPrime(Integer("41041")))
pass = false;
if (IsPrime(Integer("321197185")))
pass = false;
if (IsPrime(Integer("5394826801")))
pass = false;
if (IsPrime(Integer("232250619601")))
pass = false;
if (IsPrime(Integer("974637772161")))
pass = false;
if (pass)
std::cout << "passed:";
else
std::cout << "FAILED:";
std::cout << " Carmichael pseudo-primes\n";
// Integer is missing a couple of tests...
try {
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
@ -3199,6 +3138,66 @@ bool TestIntegerOps()
std::cout << "\nTesting Integer operations...\n\n"; std::cout << "\nTesting Integer operations...\n\n";
bool pass=true, result; bool pass=true, result;
// 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...
pass=true;
try {
// A run of 71 composites; see http://en.wikipedia.org/wiki/Prime_gap
Integer x = Integer(GlobalRNG(), 31398, 31468, Integer::PRIME);
pass=false;
} catch (const Exception&) { }
if (pass)
std::cout << "passed:";
else
std::cout << "FAILED:";
std::cout << " Integer RandomNumberNotFound\n";
// Carmichael pseudo-primes
pass=true;
if (IsPrime(Integer("561")))
pass = false;
if (IsPrime(Integer("41041")))
pass = false;
if (IsPrime(Integer("321197185")))
pass = false;
if (IsPrime(Integer("5394826801")))
pass = false;
if (IsPrime(Integer("232250619601")))
pass = false;
if (IsPrime(Integer("974637772161")))
pass = false;
if (pass)
std::cout << "passed:";
else
std::cout << "FAILED:";
std::cout << " Carmichael pseudo-primes\n";
// Integer is missing a couple of tests...
try {
Integer x = Integer::One().Doubled();
pass=(x == Integer::Two());
} catch (const Exception&) {
pass=false;
}
if (!pass)
std::cout << "FAILED: Integer Doubled\n";
// http://github.com/weidai11/cryptopp/issues/602 // http://github.com/weidai11/cryptopp/issues/602
Integer a("0x2F0500010000018000000000001C1C000000000000000A000B0000000000000000000000000000FDFFFFFF00000000"); Integer a("0x2F0500010000018000000000001C1C000000000000000A000B0000000000000000000000000000FDFFFFFF00000000");
Integer b("0x3D2F050001"); Integer b("0x3D2F050001");
@ -3311,7 +3310,7 @@ bool TestIntegerOps()
std::cout << "passed:"; std::cout << "passed:";
else else
std::cout << "FAILED:"; std::cout << "FAILED:";
std::cout << " Integer::InverseMod operations\n"; std::cout << " InverseMod operations\n";
return pass; return pass;
} }

2
validat1.cpp
View File

@ -94,6 +94,8 @@ bool ValidateAll(bool thorough)
#if defined(CRYPTOPP_EXTENDED_VALIDATION) #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/602
pass=TestIntegerOps() && pass;
// http://github.com/weidai11/cryptopp/issues/336 // http://github.com/weidai11/cryptopp/issues/336
pass=TestIntegerBitops() && pass; pass=TestIntegerBitops() && pass;
// http://github.com/weidai11/cryptopp/issues/64 // http://github.com/weidai11/cryptopp/issues/64