Apply Lutz Behnke's 56 bit cipher patch with a few

[openssl.git] / ssl / bio_ssl.c

diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index 58a6d69b9ba47152f7044f8b831671dc5ed913db..aa296996e665254e5ce094367caf0e1897b812d2 100644 (file)
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -60,27 +60,17 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "crypto.h"
-#include "bio.h"
-#include "err.h"
-#include "ssl.h"
+#include <openssl/crypto.h>
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/ssl.h>
 
-#ifndef NOPROTO
 static int ssl_write(BIO *h,char *buf,int num);
 static int ssl_read(BIO *h,char *buf,int size);
 static int ssl_puts(BIO *h,char *str);
 static long ssl_ctrl(BIO *h,int cmd,long arg1,char *arg2);
 static int ssl_new(BIO *h);
 static int ssl_free(BIO *data);
-#else
-static int ssl_write();
-static int ssl_read();
-static int ssl_puts();
-static long ssl_ctrl();
-static int ssl_new();
-static int ssl_free();
-#endif
-
 typedef struct bio_ssl_st
        {
        SSL *ssl; /* The ssl handle :-) */
@@ -104,13 +94,18 @@ static BIO_METHOD methods_sslp=
        ssl_free,
        };
 
-BIO_METHOD *BIO_f_ssl()
+union void_fn_to_char_u
+       {
+       char *char_p;
+       void (*fn_p)();
+       };
+
+BIO_METHOD *BIO_f_ssl(void)
        {
        return(&methods_sslp);
        }
 
-static int ssl_new(bi)
-BIO *bi;
+static int ssl_new(BIO *bi)
        {
        BIO_SSL *bs;
 
@@ -127,8 +122,7 @@ BIO *bi;
        return(1);
        }
 
-static int ssl_free(a)
-BIO *a;
+static int ssl_free(BIO *a)
        {
        BIO_SSL *bs;
 
@@ -147,10 +141,7 @@ BIO *a;
        return(1);
        }
        
-static int ssl_read(b,out,outl)
-BIO *b;
-char *out;
-int outl;
+static int ssl_read(BIO *b, char *out, int outl)
        {
        int ret=1;
        BIO_SSL *sb;
@@ -234,10 +225,7 @@ int outl;
        return(ret);
        }
 
-static int ssl_write(b,out,outl)
-BIO *b;
-char *out;
-int outl;
+static int ssl_write(BIO *b, char *out, int outl)
        {
        int ret,r=0;
        int retry_reason=0;
@@ -305,11 +293,7 @@ int outl;
        return(ret);
        }
 
-static long ssl_ctrl(b,cmd,num,ptr)
-BIO *b;
-int cmd;
-long num;
-char *ptr;
+static long ssl_ctrl(BIO *b, int cmd, long num, char *ptr)
        {
        SSL **sslp,*ssl;
        BIO_SSL *bs;
@@ -466,7 +450,12 @@ char *ptr;
                ret=BIO_ctrl(ssl->rbio,cmd,num,ptr);
                break;
        case BIO_CTRL_SET_CALLBACK:
-               SSL_set_info_callback(ssl,(void (*)())ptr);
+               {
+               union void_fn_to_char_u tmp_cb;
+
+               tmp_cb.char_p = ptr;
+               SSL_set_info_callback(ssl,tmp_cb.fn_p);
+               }
                break;
        case BIO_CTRL_GET_CALLBACK:
                {
@@ -483,9 +472,7 @@ char *ptr;
        return(ret);
        }
 
-static int ssl_puts(bp,str)
-BIO *bp;
-char *str;
+static int ssl_puts(BIO *bp, char *str)
        {
        int n,ret;
 
@@ -494,8 +481,7 @@ char *str;
        return(ret);
        }
 
-BIO *BIO_new_buffer_ssl_connect(ctx)
-SSL_CTX *ctx;
+BIO *BIO_new_buffer_ssl_connect(SSL_CTX *ctx)
        {
        BIO *ret=NULL,*buf=NULL,*ssl=NULL;
 
@@ -512,8 +498,7 @@ err:
        return(NULL);
        }
 
-BIO *BIO_new_ssl_connect(ctx)
-SSL_CTX *ctx;
+BIO *BIO_new_ssl_connect(SSL_CTX *ctx)
        {
        BIO *ret=NULL,*con=NULL,*ssl=NULL;
 
@@ -530,9 +515,7 @@ err:
        return(NULL);
        }
 
-BIO *BIO_new_ssl(ctx,client)
-SSL_CTX *ctx;
-int client;
+BIO *BIO_new_ssl(SSL_CTX *ctx, int client)
        {
        BIO *ret;
        SSL *ssl;
@@ -553,8 +536,7 @@ int client;
        return(ret);
        }
 
-int BIO_ssl_copy_session_id(t,f)
-BIO *t,*f;
+int BIO_ssl_copy_session_id(BIO *t, BIO *f)
        {
        t=BIO_find_type(t,BIO_TYPE_SSL);
        f=BIO_find_type(f,BIO_TYPE_SSL);
@@ -567,8 +549,7 @@ BIO *t,*f;
        return(1);
        }
 
-void BIO_ssl_shutdown(b)
-BIO *b;
+void BIO_ssl_shutdown(BIO *b)
        {
        SSL *s;