From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 16 Jun 2005 02:05:57 +0000 (+0000)
Subject: Update from head.
X-Git-Tag: OpenSSL_0_9_8-beta6~19
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ce2c19e357144e1248d5c4c9df6b775b874b5903;p=oweals%2Fopenssl.git

Update from head.
---

diff --git a/crypto/x509/x509_vfy.c b/crypto/x509/x509_vfy.c
index a4a142cd01..79dae3d3bf 100644
--- a/crypto/x509/x509_vfy.c
+++ b/crypto/x509/x509_vfy.c
@@ -776,7 +776,8 @@ static int check_crl(X509_STORE_CTX *ctx, X509_CRL *crl)
 			}
 		}
 
-	if (!check_crl_time(ctx, crl, 1))
+	ok = check_crl_time(ctx, crl, 1);
+	if (!ok)
 		goto err;
 
 	ok = 1;
@@ -1006,7 +1007,8 @@ static int internal_verify(X509_STORE_CTX *ctx)
 
 		xs->valid = 1;
 
-		if (!check_cert_time(ctx, xs))
+		ok = check_cert_time(ctx, xs);
+		if (!ok)
 			goto end;
 
 		/* The last error (if any) is still in the error value */