OpenSSL 0.9.4 merge

1 files changed, 13 insertions, 28 deletions

diff --git a/src/lib/libcrypto/x509/by_file.c b/src/lib/libcrypto/x509/by_file.c
index 09ebb9bf08..00ee5e8bbc 100644
--- a/src/lib/libcrypto/x509/by_file.c
+++ b/src/lib/libcrypto/x509/by_file.c
@@ -63,20 +63,15 @@
 #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
-
+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,17 +86,13 @@ 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;
         char *file;
@@ -138,10 +129,7 @@ char **ret;
         return((ok && ok2)?ok:0);
         }
 
-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 +149,7 @@ int type;
                 {
                 for (;;)
                         {
-                        x=PEM_read_bio_X509(in,NULL,NULL);
+                        x=PEM_read_bio_X509(in,NULL,NULL,NULL);
                         if (x == NULL)
                                 {
                                 if ((ERR_GET_REASON(ERR_peek_error()) ==
@@ -208,10 +196,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 +216,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()) ==