- X509_CRL *bad_issuer_crl = CRL_from_strings(kBadIssuerCRL);
- X509_CRL *known_critical_crl = CRL_from_strings(kKnownCriticalCRL);
- X509_CRL *unknown_critical_crl = CRL_from_strings(kUnknownCriticalCRL);
- X509_CRL *unknown_critical_crl2 = CRL_from_strings(kUnknownCriticalCRL2);
- int status = 0;
-
- if (root == NULL || leaf == NULL || basic_crl == NULL
- || revoked_crl == NULL || bad_issuer_crl == NULL
- || known_critical_crl == NULL || unknown_critical_crl == NULL
- || unknown_critical_crl2 == NULL) {
- fprintf(stderr, "Failed to parse certificates and CRLs.\n");
- goto err;
- }
-
- if (verify(leaf, root, make_CRL_stack(basic_crl, NULL),
- X509_V_FLAG_CRL_CHECK) != X509_V_OK) {
- fprintf(stderr, "Cert with CRL didn't verify.\n");
- goto err;
- }
-
- if (verify(leaf, root, make_CRL_stack(basic_crl, revoked_crl),
- X509_V_FLAG_CRL_CHECK) != X509_V_ERR_CERT_REVOKED) {
- fprintf(stderr, "Revoked CRL wasn't checked.\n");
- goto err;
- }
-
- if (verify(leaf, root, NULL,
- X509_V_FLAG_CRL_CHECK) != X509_V_ERR_UNABLE_TO_GET_CRL) {
- fprintf(stderr, "CRLs were not required.\n");
- goto err;
- }
-
- if (verify(leaf, root, make_CRL_stack(bad_issuer_crl, NULL),
- X509_V_FLAG_CRL_CHECK) != X509_V_ERR_UNABLE_TO_GET_CRL) {
- fprintf(stderr, "Bad CRL issuer was unnoticed.\n");
- goto err;
- }
+ int r;
+
+ r = TEST_ptr(basic_crl)
+ && TEST_ptr(revoked_crl)
+ && TEST_int_eq(verify(test_leaf, test_root,
+ make_CRL_stack(basic_crl, NULL),
+ X509_V_FLAG_CRL_CHECK), X509_V_OK)
+ && TEST_int_eq(verify(test_leaf, test_root,
+ make_CRL_stack(basic_crl, revoked_crl),
+ X509_V_FLAG_CRL_CHECK), X509_V_ERR_CERT_REVOKED);
+ X509_CRL_free(basic_crl);
+ X509_CRL_free(revoked_crl);
+ return r;
+}