diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-05-01 07:35:58 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2014-05-01 07:35:58 +0000 |
| commit | 3c8cb300d6ca86f1870c0c98d2cbbeaf513e1017 (patch) | |
| tree | 8b23fd2aadd858e238f84fe304e50ba3c846e1b8 /sbin | |
| parent | 67398d037770360f2b6f67d4dd811ac977119883 (diff) | |
Correct a test for X509_get_notAfter() failing or returning
an unsupported time type when passing data to keynote.
Problem introduced by angelos in 1.41 though the code
has been reformatted a few times since then.
ok otto@ miod@
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/isakmpd/x509.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/isakmpd/x509.c b/sbin/isakmpd/x509.c index 86b02874b0c..72202ee779f 100644 --- a/sbin/isakmpd/x509.c +++ b/sbin/isakmpd/x509.c @@ -1,4 +1,4 @@ -/* $OpenBSD: x509.c,v 1.116 2014/03/07 07:19:42 gerhard Exp $ */ +/* $OpenBSD: x509.c,v 1.117 2014/05/01 07:35:57 jsg Exp $ */ /* $EOM: x509.c,v 1.54 2001/01/16 18:42:16 ho Exp $ */ /* @@ -295,7 +295,7 @@ x509_generate_kn(int id, X509 *cert) } tm = X509_get_notAfter(cert); - if (tm == NULL && + if (tm == NULL || (tm->type != V_ASN1_UTCTIME && tm->type != V_ASN1_GENERALIZEDTIME)) { tt = time(0); |