Read up to INT_MAX when calling legacy BIO_read() implementations

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

diff --git a/crypto/bio/bio_meth.c b/crypto/bio/bio_meth.c
index c10f8d01d1fa960c7a5c471664192de1a7610576..daffc541a311fd2f8f9022a929abc7508c6e2c0c 100644 (file)
--- a/crypto/bio/bio_meth.c
+++ b/crypto/bio/bio_meth.c
@@ -50,13 +50,48 @@ void BIO_meth_free(BIO_METHOD *biom)
 }
 
 int (*BIO_meth_get_write(BIO_METHOD *biom)) (BIO *, const char *, int)
+{
+    return biom->bwrite_old;
+}
+
+int (*BIO_meth_get_write_ex(BIO_METHOD *biom)) (BIO *, const char *, size_t,
+                                                size_t *)
 {
     return biom->bwrite;
 }
 
+/* Conversion for old style bwrite to new style */
+int bwrite_conv(BIO *bio, const char *in, size_t inl, size_t *written)
+{
+    int ret;
+
+    if (inl > INT_MAX)
+        return 0;
+
+    ret = bio->method->bwrite_old(bio, in, (int)inl);
+
+    if (ret <= 0) {
+        *written = 0;
+        return ret;
+    }
+
+    *written = (size_t)ret;
+
+    return 1;
+}
+
 int BIO_meth_set_write(BIO_METHOD *biom,
                        int (*bwrite) (BIO *, const char *, int))
 {
+    biom->bwrite_old = bwrite;
+    biom->bwrite = bwrite_conv;
+    return 1;
+}
+
+int BIO_meth_set_write_ex(BIO_METHOD *biom,
+                       int (*bwrite) (BIO *, const char *, size_t, size_t *))
+{
+    biom->bwrite_old = NULL;
     biom->bwrite = bwrite;
     return 1;
 }
@@ -77,7 +112,7 @@ int bread_conv(BIO *bio, char *out, size_t outl, size_t *read)
     int ret;
 
     if (outl > INT_MAX)
-        return 0;
+        outl = INT_MAX;
 
     ret = bio->method->bread_old(bio, out, (int)outl);
 
@@ -102,6 +137,7 @@ int BIO_meth_set_read(BIO_METHOD *biom,
 int BIO_meth_set_read_ex(BIO_METHOD *biom,
                          int (*bread) (BIO *, char *, size_t, size_t *))
 {
+    biom->bread_old = NULL;
     biom->bread = bread;
     return 1;
 }