1 files changed, 62 insertions, 85 deletions

diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c
index 7a66b0892e..b72688ea90 100644
--- a/src/lib/libcrypto/bio/bio_lib.c
+++ b/src/lib/libcrypto/bio/bio_lib.c
@@ -58,16 +58,15 @@
 
 #include <stdio.h>
 #include <errno.h>
-#include "crypto.h"
+#include <openssl/crypto.h>
 #include "cryptlib.h"
-#include "bio.h"
-#include "stack.h"
+#include <openssl/bio.h>
+#include <openssl/stack.h>
 
 static STACK *bio_meth=NULL;
 static int bio_meth_num=0;
 
-BIO *BIO_new(method)
-BIO_METHOD *method;
+BIO *BIO_new(BIO_METHOD *method)
         {
         BIO *ret=NULL;
 
@@ -85,9 +84,7 @@ BIO_METHOD *method;
         return(ret);
         }
 
-int BIO_set(bio,method)
-BIO *bio;
-BIO_METHOD *method;
+int BIO_set(BIO *bio, BIO_METHOD *method)
         {
         bio->method=method;
         bio->callback=NULL;
@@ -110,8 +107,7 @@ BIO_METHOD *method;
         return(1);
         }
 
-int BIO_free(a)
-BIO *a;
+int BIO_free(BIO *a)
         {
         int ret=0,i;
 
@@ -121,7 +117,7 @@ BIO *a;
 #ifdef REF_PRINT
         REF_PRINT("BIO",a);
 #endif
-        if (i > 0) return(1);
+        if (i > 0) return(1);
 #ifdef REF_CHECK
         if (i < 0)
                 {
@@ -141,10 +137,7 @@ BIO *a;
         return(1);
         }
 
-int BIO_read(b,out,outl)
-BIO *b;
-char *out;
-int outl;
+int BIO_read(BIO *b, void *out, int outl)
         {
         int i;
         long (*cb)();
@@ -162,11 +155,12 @@ int outl;
 
         if (!b->init)
                 {
-                BIOerr(BIO_F_BIO_READ,BIO_R_UNINITALISED);
+                BIOerr(BIO_F_BIO_READ,BIO_R_UNINITIALIZED);
                 return(-2);
                 }
 
         i=b->method->bread(b,out,outl);
+
         if (i > 0) b->num_read+=(unsigned long)i;
 
         if (cb != NULL)
@@ -175,10 +169,7 @@ int outl;
         return(i);
         }
 
-int BIO_write(b,in,inl)
-BIO *b;
-char *in;
-int inl;
+int BIO_write(BIO *b, const char *in, int inl)
         {
         int i;
         long (*cb)();
@@ -199,22 +190,27 @@ int inl;
 
         if (!b->init)
                 {
-                BIOerr(BIO_F_BIO_WRITE,BIO_R_UNINITALISED);
+                BIOerr(BIO_F_BIO_WRITE,BIO_R_UNINITIALIZED);
                 return(-2);
                 }
 
         i=b->method->bwrite(b,in,inl);
+
         if (i > 0) b->num_write+=(unsigned long)i;
 
-        if (cb != NULL)
+        /* This is evil and not thread safe.  If the BIO has been freed,
+         * we must not call the callback.  The only way to be able to
+         * determine this is the reference count which is now invalid since
+         * the memory has been free()ed.
+         */
+        if (b->references <= 0) abort();
+        if (cb != NULL) /* && (b->references >= 1)) */
                 i=(int)cb(b,BIO_CB_WRITE|BIO_CB_RETURN,in,inl,
                         0L,(long)i);
         return(i);
         }
 
-int BIO_puts(b,in)
-BIO *b;
-char *in;
+int BIO_puts(BIO *b, const char *in)
         {
         int i;
         long (*cb)();
@@ -233,7 +229,7 @@ char *in;
 
         if (!b->init)
                 {
-                BIOerr(BIO_F_BIO_PUTS,BIO_R_UNINITALISED);
+                BIOerr(BIO_F_BIO_PUTS,BIO_R_UNINITIALIZED);
                 return(-2);
                 }
 
@@ -245,10 +241,7 @@ char *in;
         return(i);
         }
 
-int BIO_gets(b,in,inl)
-BIO *b;
-char *in;
-int inl;
+int BIO_gets(BIO *b, char *in, int inl)
         {
         int i;
         long (*cb)();
@@ -267,7 +260,7 @@ int inl;
 
         if (!b->init)
                 {
-                BIOerr(BIO_F_BIO_GETS,BIO_R_UNINITALISED);
+                BIOerr(BIO_F_BIO_GETS,BIO_R_UNINITIALIZED);
                 return(-2);
                 }
 
@@ -279,11 +272,7 @@ int inl;
         return(i);
         }
 
-long BIO_int_ctrl(b,cmd,larg,iarg)
-BIO *b;
-int cmd;
-long larg;
-int iarg;
+long BIO_int_ctrl(BIO *b, int cmd, long larg, int iarg)
         {
         int i;
 
@@ -291,10 +280,7 @@ int iarg;
         return(BIO_ctrl(b,cmd,larg,(char *)&i));
         }
 
-char *BIO_ptr_ctrl(b,cmd,larg)
-BIO *b;
-int cmd;
-long larg;
+char *BIO_ptr_ctrl(BIO *b, int cmd, long larg)
         {
         char *p=NULL;
 
@@ -304,11 +290,7 @@ long larg;
                 return(p);
         }
 
-long BIO_ctrl(b,cmd,larg,parg)
-BIO *b;
-int cmd;
-long larg;
-char *parg;
+long BIO_ctrl(BIO *b, int cmd, long larg, void *parg)
         {
         long ret;
         long (*cb)();
@@ -335,9 +317,22 @@ char *parg;
         return(ret);
         }
 
+/* It is unfortunate to duplicate in functions what the BIO_(w)pending macros
+ * do; but those macros have inappropriate return type, and for interfacing
+ * from other programming languages, C macros aren't much of a help anyway. */
+size_t BIO_ctrl_pending(BIO *bio)
+    {
+        return BIO_ctrl(bio, BIO_CTRL_PENDING, 0, NULL);
+        }
+
+size_t BIO_ctrl_wpending(BIO *bio)
+    {
+        return BIO_ctrl(bio, BIO_CTRL_WPENDING, 0, NULL);
+        }
+
+
 /* put the 'bio' on the end of b's list of operators */
-BIO *BIO_push(b,bio)
-BIO *b,*bio;
+BIO *BIO_push(BIO *b, BIO *bio)
         {
         BIO *lb;
 
@@ -354,8 +349,7 @@ BIO *b,*bio;
         }
 
 /* Remove the first and return the rest */
-BIO *BIO_pop(b)
-BIO *b;
+BIO *BIO_pop(BIO *b)
         {
         BIO *ret;
 
@@ -373,9 +367,7 @@ BIO *b;
         return(ret);
         }
 
-BIO *BIO_get_retry_BIO(bio,reason)
-BIO *bio;
-int *reason;
+BIO *BIO_get_retry_BIO(BIO *bio, int *reason)
         {
         BIO *b,*last;
 
@@ -391,15 +383,12 @@ int *reason;
         return(last);
         }
 
-int BIO_get_retry_reason(bio)
-BIO *bio;
+int BIO_get_retry_reason(BIO *bio)
         {
         return(bio->retry_reason);
         }
 
-BIO *BIO_find_type(bio,type)
-BIO *bio;
-int type;
+BIO *BIO_find_type(BIO *bio, int type)
         {
         int mt,mask;
 
@@ -421,8 +410,7 @@ int type;
         return(NULL);
         }
 
-void BIO_free_all(bio)
-BIO *bio;
+void BIO_free_all(BIO *bio)
         {
         BIO *b;
         int ref;
@@ -438,8 +426,7 @@ BIO *bio;
                 }
         }
 
-BIO *BIO_dup_chain(in)
-BIO *in;
+BIO *BIO_dup_chain(BIO *in)
         {
         BIO *ret=NULL,*eoc=NULL,*bio,*new;
 
@@ -461,9 +448,9 @@ BIO *in;
                         goto err;
                         }
 
-                /* copy app data */
-                if (!CRYPTO_dup_ex_data(bio_meth,&new->ex_data,&bio->ex_data))
-                        goto err;
+                /* copy app data */
+                if (!CRYPTO_dup_ex_data(bio_meth,&new->ex_data,&bio->ex_data))
+                        goto err;
 
                 if (ret == NULL)
                         {
@@ -483,36 +470,26 @@ err:
         return(NULL);   
         }
 
-void BIO_copy_next_retry(b)
-BIO *b;
+void BIO_copy_next_retry(BIO *b)
         {
         BIO_set_flags(b,BIO_get_retry_flags(b->next_bio));
         b->retry_reason=b->next_bio->retry_reason;
         }
 
-int BIO_get_ex_new_index(argl,argp,new_func,dup_func,free_func)
-long argl;
-char *argp;
-int (*new_func)();
-int (*dup_func)();
-void (*free_func)();
-        {
-        bio_meth_num++;
-        return(CRYPTO_get_ex_new_index(bio_meth_num-1,&bio_meth,
-                argl,argp,new_func,dup_func,free_func));
-        }
-
-int BIO_set_ex_data(bio,idx,data)
-BIO *bio;
-int idx;
-char *data;
+int BIO_get_ex_new_index(long argl, char *argp, int (*new_func)(),
+             int (*dup_func)(), void (*free_func)())
+        {
+        bio_meth_num++;
+        return(CRYPTO_get_ex_new_index(bio_meth_num-1,&bio_meth,
+                argl,argp,new_func,dup_func,free_func));
+        }
+
+int BIO_set_ex_data(BIO *bio, int idx, char *data)
         {
         return(CRYPTO_set_ex_data(&(bio->ex_data),idx,data));
         }
 
-char *BIO_get_ex_data(bio,idx)
-BIO *bio;
-int idx;
+char *BIO_get_ex_data(BIO *bio, int idx)
         {
         return(CRYPTO_get_ex_data(&(bio->ex_data),idx));
         }