Fix strange formatting by indent
[oweals/openssl.git] / crypto / x509 / by_file.c
index 22be90cdcd91f4253ecc67fa81455dc22544f92c..a5e0d4aefa1a2f0f767248d3061e588f3437f1db 100644 (file)
@@ -150,7 +150,7 @@ int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type)
                        x=PEM_read_bio_X509_AUX(in,NULL,NULL,NULL);
                        if (x == NULL)
                                {
-                               if ((ERR_GET_REASON(ERR_peek_error()) ==
+                               if ((ERR_GET_REASON(ERR_peek_last_error()) ==
                                        PEM_R_NO_START_LINE) && (count > 0))
                                        {
                                        ERR_clear_error();
@@ -217,7 +217,7 @@ int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
                        x=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL);
                        if (x == NULL)
                                {
-                               if ((ERR_GET_REASON(ERR_peek_error()) ==
+                               if ((ERR_GET_REASON(ERR_peek_last_error()) ==
                                        PEM_R_NO_START_LINE) && (count > 0))
                                        {
                                        ERR_clear_error();
@@ -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++;
                }