From: jsg <jsg@openbsd.org>
Date: Thu, 1 May 2014 07:35:57 +0000 (+0000)
Subject: Correct a test for X509_get_notAfter() failing or returning
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=dd449936a2746533bff2670139dda5ae1adae0ed;p=openbsd

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@
---

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);