When looking for the issuer of a certificate, if the current candidate is

expired or not valid yet, continue looking; only return an expired certificate
if no valid certificates have been found.

OpenSSL PR #3359 via OpenSSL trunk.

1 files changed, 20 insertions, 8 deletions

diff --git a/src/lib/libcrypto/x509/x509_vfy.c b/src/lib/libcrypto/x509/x509_vfy.c
index f7feb85f36..9d7a7d1228 100644
--- a/src/lib/libcrypto/x509/x509_vfy.c
+++ b/src/lib/libcrypto/x509/x509_vfy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_vfy.c,v 1.33 2014/07/11 08:44:49 jsing Exp $ */
+/* $OpenBSD: x509_vfy.c,v 1.34 2014/07/11 12:52:41 miod Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -73,6 +73,7 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
+#include "x509_lcl.h"
 
 /* CRL score values */
 
@@ -408,14 +409,17 @@ static X509 *
 find_issuer(X509_STORE_CTX *ctx, STACK_OF(X509) *sk, X509 *x)
 {
         int i;
-        X509 *issuer;
+        X509 *issuer, *rv = NULL;
 
         for (i = 0; i < sk_X509_num(sk); i++) {
                 issuer = sk_X509_value(sk, i);
-                if (ctx->check_issued(ctx, x, issuer))
-                        return issuer;
+                if (ctx->check_issued(ctx, x, issuer)) {
+                        rv = issuer;
+                        if (x509_check_cert_time(ctx, rv, 1))
+                                break;
+                }
         }
-        return NULL;
+        return rv;
 }
 
 /* Given a possible certificate and issuer check them */
@@ -1492,8 +1496,8 @@ check_policy(X509_STORE_CTX *ctx)
         return 1;
 }
 
-static int
-check_cert_time(X509_STORE_CTX *ctx, X509 *x)
+int
+x509_check_cert_time(X509_STORE_CTX *ctx, X509 *x, int quiet)
 {
         time_t *ptime;
         int i;
@@ -1505,6 +1509,8 @@ check_cert_time(X509_STORE_CTX *ctx, X509 *x)
 
         i = X509_cmp_time(X509_get_notBefore(x), ptime);
         if (i == 0) {
+                if (quiet)
+                        return 0;
                 ctx->error = X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD;
                 ctx->current_cert = x;
                 if (!ctx->verify_cb(0, ctx))
@@ -1512,6 +1518,8 @@ check_cert_time(X509_STORE_CTX *ctx, X509 *x)
         }
 
         if (i > 0) {
+                if (quiet)
+                        return 0;
                 ctx->error = X509_V_ERR_CERT_NOT_YET_VALID;
                 ctx->current_cert = x;
                 if (!ctx->verify_cb(0, ctx))
@@ -1520,6 +1528,8 @@ check_cert_time(X509_STORE_CTX *ctx, X509 *x)
 
         i = X509_cmp_time(X509_get_notAfter(x), ptime);
         if (i == 0) {
+                if (quiet)
+                        return 0;
                 ctx->error = X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD;
                 ctx->current_cert = x;
                 if (!ctx->verify_cb(0, ctx))
@@ -1527,6 +1537,8 @@ check_cert_time(X509_STORE_CTX *ctx, X509 *x)
         }
 
         if (i < 0) {
+                if (quiet)
+                        return 0;
                 ctx->error = X509_V_ERR_CERT_HAS_EXPIRED;
                 ctx->current_cert = x;
                 if (!ctx->verify_cb(0, ctx))
@@ -1597,7 +1609,7 @@ internal_verify(X509_STORE_CTX *ctx)
 
                 xs->valid = 1;
 
-                ok = check_cert_time(ctx, xs);
+                ok = x509_check_cert_time(ctx, xs, 0);
                 if (!ok)
                         goto end;