replace macros with functions

[openssl.git] / crypto / bio / bio_lib.c

diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c
index dcf033890d7b03b05861780fb7cdd4d6b6bd7103..3f52ae953c2946b88e6d04c360aa52a4c2b631f7 100644 (file)
--- a/crypto/bio/bio_lib.c
+++ b/crypto/bio/bio_lib.c
@@ -63,9 +63,6 @@
 #include <openssl/bio.h>
 #include <openssl/stack.h>
 
-static STACK_OF(CRYPTO_EX_DATA_FUNCS) *bio_meth=NULL;
-static int bio_meth_num=0;
-
 BIO *BIO_new(BIO_METHOD *method)
        {
        BIO *ret=NULL;
@@ -100,10 +97,14 @@ int BIO_set(BIO *bio, BIO_METHOD *method)
        bio->references=1;
        bio->num_read=0L;
        bio->num_write=0L;
-       CRYPTO_new_ex_data(bio_meth,bio,&bio->ex_data);
+       CRYPTO_new_ex_data(CRYPTO_EX_INDEX_BIO, bio, &bio->ex_data);
        if (method->create != NULL)
                if (!method->create(bio))
+                       {
+                       CRYPTO_free_ex_data(CRYPTO_EX_INDEX_BIO, bio,
+                                       &bio->ex_data);
                        return(0);
+                       }
        return(1);
        }
 
@@ -129,7 +130,7 @@ int BIO_free(BIO *a)
                ((i=(int)a->callback(a,BIO_CB_FREE,NULL,0,0L,1L)) <= 0))
                        return(i);
 
-       CRYPTO_free_ex_data(bio_meth,a,&a->ex_data);
+       CRYPTO_free_ex_data(CRYPTO_EX_INDEX_BIO, a, &a->ex_data);
 
        if ((a->method == NULL) || (a->method->destroy == NULL)) return(1);
        ret=a->method->destroy(a);
@@ -140,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))
                {
@@ -175,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);
@@ -210,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))
                {
@@ -243,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))
                {
@@ -271,6 +318,18 @@ int BIO_gets(BIO *b, char *in, int inl)
        return(i);
        }
 
+int BIO_indent(BIO *b,int indent,int max)
+       {
+       if(indent < 0)
+               indent=0;
+       if(indent > max)
+               indent=max;
+       while(indent--)
+               if(BIO_puts(b," ") != 1)
+                       return 0;
+       return 1;
+       }
+
 long BIO_int_ctrl(BIO *b, int cmd, long larg, int iarg)
        {
        int i;
@@ -292,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);
 
@@ -319,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);
                }
 
@@ -382,6 +441,8 @@ BIO *BIO_pop(BIO *b)
        if (b == NULL) return(NULL);
        ret=b->next_bio;
 
+       BIO_ctrl(b,BIO_CTRL_POP,0,NULL);
+
        if (b->prev_bio != NULL)
                b->prev_bio->next_bio=b->next_bio;
        if (b->next_bio != NULL)
@@ -389,7 +450,6 @@ BIO *BIO_pop(BIO *b)
 
        b->next_bio=NULL;
        b->prev_bio=NULL;
-       BIO_ctrl(b,BIO_CTRL_POP,0,NULL);
        return(ret);
        }
 
@@ -482,7 +542,8 @@ BIO *BIO_dup_chain(BIO *in)
                        }
 
                /* copy app data */
-               if (!CRYPTO_dup_ex_data(bio_meth,&new->ex_data,&bio->ex_data))
+               if (!CRYPTO_dup_ex_data(CRYPTO_EX_INDEX_BIO, &new->ex_data,
+                                       &bio->ex_data))
                        goto err;
 
                if (ret == NULL)
@@ -512,10 +573,8 @@ void BIO_copy_next_retry(BIO *b)
 int BIO_get_ex_new_index(long argl, void *argp, CRYPTO_EX_new *new_func,
             CRYPTO_EX_dup *dup_func, CRYPTO_EX_free *free_func)
        {
-       if(CRYPTO_get_ex_new_index(bio_meth_num, &bio_meth, argl, argp,
-                               new_func, dup_func, free_func) < 0)
-               return -1;
-       return (bio_meth_num++);
+       return CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_BIO, argl, argp,
+                               new_func, dup_func, free_func);
        }
 
 int BIO_set_ex_data(BIO *bio, int idx, void *data)