e_aes.c: prevent potential DoS in aes_gcm_tls_cipher.

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

diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c
index 5e96772ca5bb452e758589651f9cee710ecfcef3..e12bc3a2ca43a2081f04d964fa7618fe81aedb70 100644 (file)
--- a/crypto/bio/bio_lib.c
+++ b/crypto/bio/bio_lib.c
@@ -110,7 +110,7 @@ int BIO_set(BIO *bio, BIO_METHOD *method)
 
 int BIO_free(BIO *a)
        {
-       int ret=0,i;
+       int i;
 
        if (a == NULL) return(0);
 
@@ -133,7 +133,7 @@ int BIO_free(BIO *a)
        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);
+       a->method->destroy(a);
        OPENSSL_free(a);
        return(1);
        }
@@ -141,6 +141,52 @@ 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;
@@ -338,7 +384,7 @@ long BIO_callback_ctrl(BIO *b, int cmd, void (*fp)(struct bio_st *, int, const c
 
        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);
                }
 
@@ -383,7 +429,7 @@ BIO *BIO_push(BIO *b, BIO *bio)
        if (bio != NULL)
                bio->prev_bio=lb;
        /* called to do internal processing */
-       BIO_ctrl(b,BIO_CTRL_PUSH,0,NULL);
+       BIO_ctrl(b,BIO_CTRL_PUSH,0,lb);
        return(b);
        }
 
@@ -395,7 +441,7 @@ BIO *BIO_pop(BIO *b)
        if (b == NULL) return(NULL);
        ret=b->next_bio;
 
-       BIO_ctrl(b,BIO_CTRL_POP,0,NULL);
+       BIO_ctrl(b,BIO_CTRL_POP,0,b);
 
        if (b->prev_bio != NULL)
                b->prev_bio->next_bio=b->next_bio;