Disable asserts for standard configurations.

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

diff --git a/crypto/bio/bss_bio.c b/crypto/bio/bss_bio.c
index ea9d5c714aed1716528a6bf3b198864136b5e15a..8c989ba6eaff4485fd0b7c525d6f757222e35b11 100644 (file)
--- a/crypto/bio/bss_bio.c
+++ b/crypto/bio/bss_bio.c
@@ -7,6 +7,10 @@
  * for which no specific BIO method is available.
  * See ssl/ssltest.c for some hints on how this can be used. */
 
+#ifndef BIO_PAIR_DEBUG
+# define NDEBUG
+#endif
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ -186,7 +190,6 @@ static int bio_read(BIO *bio, char *buf, int size_)
                }
        while (rest);
        
-       peer_b->request -= size;
        return size;
        }
 
@@ -281,6 +284,11 @@ static long bio_ctrl(BIO *bio, int cmd, long num, void *ptr)
                        BIOerr(BIO_F_BIO_CTRL, BIO_R_IN_USE);
                        ret = 0;
                        }
+               else if (num == 0)
+                       {
+                       BIOerr(BIO_F_BIO_CTRL, BIO_R_INVALID_ARGUMENT);
+                       ret = 0;
+                       }
                else
                        {
                        size_t new_size = num;
@@ -572,7 +580,7 @@ size_t BIO_ctrl_get_write_guarantee(BIO *bio)
        return BIO_ctrl(bio, BIO_C_GET_WRITE_GUARANTEE, 0, NULL);
        }
 
-size_t BIO_ctrl_read_request(BIO *bio)
+size_t BIO_ctrl_get_read_request(BIO *bio)
     {
        return BIO_ctrl(bio, BIO_C_GET_READ_REQUEST, 0, NULL);
        }