1 files changed, 61 insertions, 45 deletions

diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c
index 09ebb9bf08..92e00d2d73 100644
--- a/src/lib/libcrypto/x509/by_file.c
+++ b/src/lib/libcrypto/x509/by_file.c
@@ -59,24 +59,17 @@
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 
 #include "cryptlib.h"
-#include "lhash.h"
-#include "buffer.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/lhash.h>
+#include <openssl/buffer.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
-#ifndef NO_STDIO
-
-#ifndef NOPROTO
-static int by_file_ctrl(X509_LOOKUP *ctx,int cmd,char *argc,
-        long argl,char **ret);
-#else
-static int by_file_ctrl();
-#endif
+#ifndef OPENSSL_NO_STDIO
 
+static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argc,
+        long argl, char **ret);
 X509_LOOKUP_METHOD x509_file_lookup=
         {
         "Load file into cache",
@@ -91,19 +84,15 @@ X509_LOOKUP_METHOD x509_file_lookup=
         NULL,           /* get_by_alias */
         };
 
-X509_LOOKUP_METHOD *X509_LOOKUP_file()
+X509_LOOKUP_METHOD *X509_LOOKUP_file(void)
         {
         return(&x509_file_lookup);
         }
 
-static int by_file_ctrl(ctx,cmd,argp,argl,ret)
-X509_LOOKUP *ctx;
-int cmd;
-char *argp;
-long argl;
-char **ret;
+static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl,
+             char **ret)
         {
-        int ok=0,ok2=0;
+        int ok=0;
         char *file;
 
         switch (cmd)
@@ -111,37 +100,33 @@ char **ret;
         case X509_L_FILE_LOAD:
                 if (argl == X509_FILETYPE_DEFAULT)
                         {
-                        ok=X509_load_cert_file(ctx,X509_get_default_cert_file(),
-                                X509_FILETYPE_PEM);
-                        ok2=X509_load_crl_file(ctx,X509_get_default_cert_file(),
-                                X509_FILETYPE_PEM);
-                        if (!ok || !ok2)
+                        ok = (X509_load_cert_crl_file(ctx,X509_get_default_cert_file(),
+                                X509_FILETYPE_PEM) != 0);
+                        if (!ok)
                                 {
                                 X509err(X509_F_BY_FILE_CTRL,X509_R_LOADING_DEFAULTS);
                                 }
                         else
                                 {
                                 file=(char *)Getenv(X509_get_default_cert_file_env());
-                                ok=X509_load_cert_file(ctx,file,
-                                        X509_FILETYPE_PEM);
-                                ok2=X509_load_crl_file(ctx,file,
-                                        X509_FILETYPE_PEM);
+                                ok = (X509_load_cert_crl_file(ctx,file,
+                                        X509_FILETYPE_PEM) != 0);
                                 }
                         }
                 else
                         {
-                        ok=X509_load_cert_file(ctx,argp,(int)argl);
-                        ok2=X509_load_crl_file(ctx,argp,(int)argl);
+                        if(argl == X509_FILETYPE_PEM)
+                                ok = (X509_load_cert_crl_file(ctx,argp,
+                                        X509_FILETYPE_PEM) != 0);
+                        else
+                                ok = (X509_load_cert_file(ctx,argp,(int)argl) != 0);
                         }
                 break;
                 }
-        return((ok && ok2)?ok:0);
+        return(ok);
         }
 
-int X509_load_cert_file(ctx,file,type)
-X509_LOOKUP *ctx;
-char *file;
-int type;
+int X509_load_cert_file(X509_LOOKUP *ctx, const char *file, int type)
         {
         int ret=0;
         BIO *in=NULL;
@@ -161,7 +146,7 @@ int type;
                 {
                 for (;;)
                         {
-                        x=PEM_read_bio_X509(in,NULL,NULL);
+                        x=PEM_read_bio_X509_AUX(in,NULL,NULL,NULL);
                         if (x == NULL)
                                 {
                                 if ((ERR_GET_REASON(ERR_peek_error()) ==
@@ -208,10 +193,7 @@ err:
         return(ret);
         }
 
-int X509_load_crl_file(ctx,file,type)
-X509_LOOKUP *ctx;
-char *file;
-int type;
+int X509_load_crl_file(X509_LOOKUP *ctx, const char *file, int type)
         {
         int ret=0;
         BIO *in=NULL;
@@ -231,7 +213,7 @@ int type;
                 {
                 for (;;)
                         {
-                        x=PEM_read_bio_X509_CRL(in,NULL,NULL);
+                        x=PEM_read_bio_X509_CRL(in,NULL,NULL,NULL);
                         if (x == NULL)
                                 {
                                 if ((ERR_GET_REASON(ERR_peek_error()) ==
@@ -278,5 +260,39 @@ err:
         return(ret);
         }
 
-#endif /* NO_STDIO */
+int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char *file, int type)
+{
+        STACK_OF(X509_INFO) *inf;
+        X509_INFO *itmp;
+        BIO *in;
+        int i, count = 0;
+        if(type != X509_FILETYPE_PEM)
+                return X509_load_cert_file(ctx, file, type);
+        in = BIO_new_file(file, "r");
+        if(!in) {
+                X509err(X509_F_X509_LOAD_CERT_CRL_FILE,ERR_R_SYS_LIB);
+                return 0;
+        }
+        inf = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL);
+        BIO_free(in);
+        if(!inf) {
+                X509err(X509_F_X509_LOAD_CERT_CRL_FILE,ERR_R_PEM_LIB);
+                return 0;
+        }
+        for(i = 0; i < sk_X509_INFO_num(inf); i++) {
+                itmp = sk_X509_INFO_value(inf, i);
+                if(itmp->x509) {
+                        X509_STORE_add_cert(ctx->store_ctx, itmp->x509);
+                        count++;
+                } else if(itmp->crl) {
+                        X509_STORE_add_crl(ctx->store_ctx, itmp->crl);
+                        count++;
+                }
+        }
+        sk_X509_INFO_pop_free(inf, X509_INFO_free);
+        return count;
+}
+
+
+#endif /* OPENSSL_NO_STDIO */