OpenSSL 0.9.4 merge

1 files changed, 8 insertions, 31 deletions

diff --git a/src/lib/libcrypto/evp/bio_b64.c b/src/lib/libcrypto/evp/bio_b64.c
index 73172b9a07..84729119df 100644
--- a/src/lib/libcrypto/evp/bio_b64.c
+++ b/src/lib/libcrypto/evp/bio_b64.c
@@ -59,10 +59,9 @@
 #include <stdio.h>
 #include <errno.h>
 #include "cryptlib.h"
-#include "buffer.h"
-#include "evp.h"
+#include <openssl/buffer.h>
+#include <openssl/evp.h>
 
-#ifndef NOPROTO
 static int b64_write(BIO *h,char *buf,int num);
 static int b64_read(BIO *h,char *buf,int size);
 /*static int b64_puts(BIO *h,char *str); */
@@ -70,16 +69,6 @@ static int b64_read(BIO *h,char *buf,int size);
 static long b64_ctrl(BIO *h,int cmd,long arg1,char *arg2);
 static int b64_new(BIO *h);
 static int b64_free(BIO *data);
-#else
-static int b64_write();
-static int b64_read();
-/*static int b64_puts(); */
-/*static int b64_gets(); */
-static long b64_ctrl();
-static int b64_new();
-static int b64_free();
-#endif
-
 #define B64_BLOCK_SIZE  1024
 #define B64_BLOCK_SIZE2 768
 #define B64_NONE        0
@@ -113,13 +102,12 @@ static BIO_METHOD methods_b64=
         b64_free,
         };
 
-BIO_METHOD *BIO_f_base64()
+BIO_METHOD *BIO_f_base64(void)
         {
         return(&methods_b64);
         }
 
-static int b64_new(bi)
-BIO *bi;
+static int b64_new(BIO *bi)
         {
         BIO_B64_CTX *ctx;
 
@@ -140,8 +128,7 @@ BIO *bi;
         return(1);
         }
 
-static int b64_free(a)
-BIO *a;
+static int b64_free(BIO *a)
         {
         if (a == NULL) return(0);
         Free(a->ptr);
@@ -151,10 +138,7 @@ BIO *a;
         return(1);
         }
         
-static int b64_read(b,out,outl)
-BIO *b;
-char *out;
-int outl;
+static int b64_read(BIO *b, char *out, int outl)
         {
         int ret=0,i,ii,j,k,x,n,num,ret_code=0;
         BIO_B64_CTX *ctx;
@@ -354,10 +338,7 @@ int outl;
         return((ret == 0)?ret_code:ret);
         }
 
-static int b64_write(b,in,inl)
-BIO *b;
-char *in;
-int inl;
+static int b64_write(BIO *b, char *in, int inl)
         {
         int ret=inl,n,i;
         BIO_B64_CTX *ctx;
@@ -451,11 +432,7 @@ int inl;
         return(ret);
         }
 
-static long b64_ctrl(b,cmd,num,ptr)
-BIO *b;
-int cmd;
-long num;
-char *ptr;
+static long b64_ctrl(BIO *b, int cmd, long num, char *ptr)
         {
         BIO_B64_CTX *ctx;
         long ret=1;