import of OpenSSL 0.9.8h

1 files changed, 53 insertions, 7 deletions

diff --git a/src/lib/libcrypto/bio/bio_lib.c b/src/lib/libcrypto/bio/bio_lib.c
index 692c8fb5c6..3f52ae953c 100644
--- a/src/lib/libcrypto/bio/bio_lib.c
+++ b/src/lib/libcrypto/bio/bio_lib.c
@@ -141,10 +141,56 @@ int BIO_free(BIO *a)
 void BIO_vfree(BIO *a)
     { BIO_free(a); }
 
+void BIO_clear_flags(BIO *b, int flags)
+        {
+        b->flags &= ~flags;
+        }
+
+int     BIO_test_flags(const BIO *b, int flags)
+        {
+        return (b->flags & flags);
+        }
+
+void    BIO_set_flags(BIO *b, int flags)
+        {
+        b->flags |= flags;
+        }
+
+long (*BIO_get_callback(const BIO *b))(struct bio_st *,int,const char *,int, long,long)
+        {
+        return b->callback;
+        }
+
+void BIO_set_callback(BIO *b, long (*cb)(struct bio_st *,int,const char *,int, long,long))
+        {
+        b->callback = cb;
+        }
+
+void BIO_set_callback_arg(BIO *b, char *arg)
+        {
+        b->cb_arg = arg;
+        }
+
+char * BIO_get_callback_arg(const BIO *b)
+        {
+        return b->cb_arg;
+        }
+
+const char * BIO_method_name(const BIO *b)
+        {
+        return b->method->name;
+        }
+
+int BIO_method_type(const BIO *b)
+        {
+        return b->method->type;
+        }
+
+
 int BIO_read(BIO *b, void *out, int outl)
         {
         int i;
-        long (*cb)();
+        long (*cb)(BIO *,int,const char *,int,long,long);
 
         if ((b == NULL) || (b->method == NULL) || (b->method->bread == NULL))
                 {
@@ -176,7 +222,7 @@ int BIO_read(BIO *b, void *out, int outl)
 int BIO_write(BIO *b, const void *in, int inl)
         {
         int i;
-        long (*cb)();
+        long (*cb)(BIO *,int,const char *,int,long,long);
 
         if (b == NULL)
                 return(0);
@@ -211,7 +257,7 @@ int BIO_write(BIO *b, const void *in, int inl)
 int BIO_puts(BIO *b, const char *in)
         {
         int i;
-        long (*cb)();
+        long (*cb)(BIO *,int,const char *,int,long,long);
 
         if ((b == NULL) || (b->method == NULL) || (b->method->bputs == NULL))
                 {
@@ -244,7 +290,7 @@ int BIO_puts(BIO *b, const char *in)
 int BIO_gets(BIO *b, char *in, int inl)
         {
         int i;
-        long (*cb)();
+        long (*cb)(BIO *,int,const char *,int,long,long);
 
         if ((b == NULL) || (b->method == NULL) || (b->method->bgets == NULL))
                 {
@@ -305,7 +351,7 @@ char *BIO_ptr_ctrl(BIO *b, int cmd, long larg)
 long BIO_ctrl(BIO *b, int cmd, long larg, void *parg)
         {
         long ret;
-        long (*cb)();
+        long (*cb)(BIO *,int,const char *,int,long,long);
 
         if (b == NULL) return(0);
 
@@ -332,13 +378,13 @@ long BIO_ctrl(BIO *b, int cmd, long larg, void *parg)
 long BIO_callback_ctrl(BIO *b, int cmd, void (*fp)(struct bio_st *, int, const char *, int, long, long))
         {
         long ret;
-        long (*cb)();
+        long (*cb)(BIO *,int,const char *,int,long,long);
 
         if (b == NULL) return(0);
 
         if ((b->method == NULL) || (b->method->callback_ctrl == NULL))
                 {
-                BIOerr(BIO_F_BIO_CTRL,BIO_R_UNSUPPORTED_METHOD);
+                BIOerr(BIO_F_BIO_CALLBACK_CTRL,BIO_R_UNSUPPORTED_METHOD);
                 return(-2);
                 }