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 22be90cdcd91f4253ecc67fa81455dc22544f92c..b4b04183d0714f967d6ed75935378345d0a153a5 100644 (file)
--- 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++;
                }