summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Josefsson <simon@josefsson.org>2009-05-25 10:03:25 +0200
committerSimon Josefsson <simon@josefsson.org>2009-05-25 10:03:25 +0200
commit051c41695f50c448e5779d52ff0724796e4c9c91 (patch)
treea4b91b42ed40ac5958d1867900cc23d455a6542a
parent66c1aa16c3cd0019fe78369e11813f18978fe20f (diff)
downloadgnutls-051c41695f50c448e5779d52ff0724796e4c9c91.tar.gz
Fix expired certs. Exit early to make it easier to find failing test.
Reported by Andreas Metzler <ametzler@downhill.at.eu.org> in <http://permalink.gmane.org/gmane.comp.encryption.gpg.gnutls.devel/3580>.
-rw-r--r--tests/chainverify.c19
1 files changed, 16 insertions, 3 deletions
diff --git a/tests/chainverify.c b/tests/chainverify.c
index 0bdee522c5..cd3598e8fd 100644
--- a/tests/chainverify.c
+++ b/tests/chainverify.c
@@ -701,10 +701,18 @@ static struct
GNUTLS_VERIFY_ALLOW_SIGN_RSA_MD5, 0 },
{ "v1ca fail", v1ca, &v1ca[2],
0, GNUTLS_CERT_SIGNER_NOT_CA | GNUTLS_CERT_INVALID },
+ { "v1ca expired", v1ca, &v1ca[2],
+ GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT,
+ GNUTLS_CERT_EXPIRED | GNUTLS_CERT_INVALID },
{ "v1ca ok", v1ca, &v1ca[2],
- GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT, 0 },
- { "v1ca ok2", v1ca, &v1ca[2],
- GNUTLS_VERIFY_ALLOW_ANY_X509_V1_CA_CRT, 0 },
+ GNUTLS_VERIFY_DISABLE_TIME_CHECKS | GNUTLS_VERIFY_ALLOW_X509_V1_CA_CRT,
+ 0 },
+ { "v1ca2 expired", v1ca, &v1ca[2],
+ GNUTLS_VERIFY_ALLOW_ANY_X509_V1_CA_CRT,
+ GNUTLS_CERT_EXPIRED | GNUTLS_CERT_INVALID },
+ { "v1ca2 ok", v1ca, &v1ca[2],
+ GNUTLS_VERIFY_DISABLE_TIME_CHECKS | GNUTLS_VERIFY_ALLOW_ANY_X509_V1_CA_CRT,
+ 0 },
{ "cacertrsamd5 fail", cacertrsamd5, &cacertrsamd5[2],
0, GNUTLS_CERT_INSECURE_ALGORITHM | GNUTLS_CERT_INVALID },
{ "cacertrsamd5 ok", cacertrsamd5, &cacertrsamd5[2],
@@ -810,6 +818,11 @@ main (int argc, char *argv[])
error (0, 0, "verify_status: %d expected: %d",
verify_status, chains[i].expected_verify_result);
exit_val = 1;
+ if (argc > 1)
+ {
+ printf ("Exiting early with status...%d\n", exit_val);
+ return exit_val;
+ }
}
else
printf ("done\n");