aboutsummaryrefslogtreecommitdiffstats
path: root/checks
diff options
context:
space:
mode:
authorlloyd <[email protected]>2010-10-07 18:59:19 +0000
committerlloyd <[email protected]>2010-10-07 18:59:19 +0000
commitd1740672b8f9e0b5be1cd3d9f5da9ffd76c7c300 (patch)
treea02523711e9e6021ab762a1a36b0b9ac4be0375b /checks
parentf8165e1fcdefebd9bd60449e93c4a7fc70179ad5 (diff)
Fix CRL reason codes and updating of CRLs. Add tests for both cases.
Diffstat (limited to 'checks')
-rw-r--r--checks/check.cpp1
-rw-r--r--checks/pk.cpp1
-rw-r--r--checks/x509.cpp2
3 files changed, 1 insertions, 3 deletions
diff --git a/checks/check.cpp b/checks/check.cpp
index cacc07cb0..ca9ec84e9 100644
--- a/checks/check.cpp
+++ b/checks/check.cpp
@@ -215,6 +215,7 @@ int run_test_suite(RandomNumberGenerator& rng)
errors += do_validation_tests(EXPECTED_FAIL_FILE, rng, false);
errors += do_bigint_tests(BIGINT_VALIDATION_FILE, rng);
errors += do_pk_validation_tests(PK_VALIDATION_FILE, rng);
+ do_x509_tests(rng);
//errors += do_cvc_tests(rng);
}
catch(std::exception& e)
diff --git a/checks/pk.cpp b/checks/pk.cpp
index eb93cc531..f38cf97a6 100644
--- a/checks/pk.cpp
+++ b/checks/pk.cpp
@@ -916,7 +916,6 @@ u32bit do_pk_validation_tests(const std::string& filename,
errors += do_ecdsa_tests(rng);
errors += do_ecdh_tests(rng);
do_pk_keygen_tests(rng);
- do_x509_tests(rng);
return errors;
}
diff --git a/checks/x509.cpp b/checks/x509.cpp
index 24d67dc1c..43d374411 100644
--- a/checks/x509.cpp
+++ b/checks/x509.cpp
@@ -220,7 +220,6 @@ void do_x509_tests(RandomNumberGenerator& rng)
if(store.validate_cert(user2_cert) != CERT_IS_REVOKED)
std::cout << "\nFAILED: User cert #2 was not revoked" << std::endl;
-#if 0
revoked.clear();
revoked.push_back(CRL_Entry(user1_cert, REMOVE_FROM_CRL));
X509_CRL crl3 = ca.update_crl(crl2, revoked, rng);
@@ -230,7 +229,6 @@ void do_x509_tests(RandomNumberGenerator& rng)
if(store.validate_cert(user1_cert) != VERIFIED)
std::cout << "\nFAILED: User cert #1 was not un-revoked" << std::endl;
-#endif
check_against_copy(ca_key, rng);
check_against_copy(user1_key, rng);