From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 19 Mar 2003 13:55:48 +0000 (+0000)
Subject: Fix Certificate and CRL adding in X509_load_cert_crl_file:
X-Git-Tag: BEN_FIPS_TEST_1~38^2~255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ed1fa481312c1f2d18d3cf7cf44d3538213bab8;p=thirdparty%2Fopenssl.git

Fix Certificate and CRL adding in X509_load_cert_crl_file:
an X509_INFO structure can contain more than one object,
for example a certififcate and a CRL.
---

diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
index 22be90cdcd9..b4b04183d07 100644
--- a/crypto/x509/by_file.c
+++ b/crypto/x509/by_file.c
@@ -285,7 +285,8 @@ int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type)
 		if(itmp->x509) {
 			X509_STORE_add_cert(ctx->store_ctx, itmp->x509);
 			count++;
-		} else if(itmp->crl) {
+		}
+		if(itmp->crl) {
 			X509_STORE_add_crl(ctx->store_ctx, itmp->crl);
 			count++;
 		}