1 files changed, 30 insertions, 9 deletions

diff --git a/src/lib/libcrypto/bio/bss_bio.c b/src/lib/libcrypto/bio/bss_bio.c
index 0d0f9356f7..1e2d7491f2 100644
--- a/src/lib/libcrypto/bio/bss_bio.c
+++ b/src/lib/libcrypto/bio/bss_bio.c
@@ -19,8 +19,14 @@
 
 #include <openssl/bio.h>
 #include <openssl/err.h>
+#include <openssl/err.h>
 #include <openssl/crypto.h>
 
+#include "openssl/e_os.h"
+#ifndef SSIZE_MAX
+# define SSIZE_MAX INT_MAX
+#endif
+
 static int bio_new(BIO *bio);
 static int bio_free(BIO *bio);
 static int bio_read(BIO *bio, char *buf, int size);
@@ -205,10 +211,10 @@ static int bio_read(BIO *bio, char *buf, int size_)
  */
 /* WARNING: The non-copying interface is largely untested as of yet
  * and may contain bugs. */
-static size_t bio_nread0(BIO *bio, char **buf)
+static ssize_t bio_nread0(BIO *bio, char **buf)
         {
         struct bio_bio_st *b, *peer_b;
-        size_t num;
+        ssize_t num;
         
         BIO_clear_retry_flags(bio);
 
@@ -243,15 +249,20 @@ static size_t bio_nread0(BIO *bio, char **buf)
         return num;
         }
 
-static size_t bio_nread(BIO *bio, char **buf, size_t num)
+static ssize_t bio_nread(BIO *bio, char **buf, size_t num_)
         {
         struct bio_bio_st *b, *peer_b;
-        size_t available;
+        ssize_t num, available;
+
+        if (num_ > SSIZE_MAX)
+                num = SSIZE_MAX;
+        else
+                num = (ssize_t)num_;
 
         available = bio_nread0(bio, buf);
         if (num > available)
                 num = available;
-        if (num == 0)
+        if (num <= 0)
                 return num;
 
         b = bio->ptr;
@@ -351,7 +362,7 @@ static int bio_write(BIO *bio, char *buf, int num_)
  * (example usage:  bio_nwrite0(), write to buffer, bio_nwrite()
  *  or just         bio_nwrite(), write to buffer)
  */
-static size_t bio_nwrite0(BIO *bio, char **buf)
+static ssize_t bio_nwrite0(BIO *bio, char **buf)
         {
         struct bio_bio_st *b;
         size_t num;
@@ -399,15 +410,20 @@ static size_t bio_nwrite0(BIO *bio, char **buf)
         return num;
         }
 
-static size_t bio_nwrite(BIO *bio, char **buf, size_t num)
+static ssize_t bio_nwrite(BIO *bio, char **buf, size_t num_)
         {
         struct bio_bio_st *b;
-        size_t space;
+        ssize_t num, space;
+
+        if (num_ > SSIZE_MAX)
+                num = SSIZE_MAX;
+        else
+                num = (ssize_t)num_;
 
         space = bio_nwrite0(bio, buf);
         if (num > space)
                 num = space;
-        if (num == 0)
+        if (num <= 0)
                 return num;
         b = bio->ptr;
         assert(b != NULL);
@@ -509,6 +525,11 @@ static long bio_ctrl(BIO *bio, int cmd, long num, void *ptr)
                 ret = 1;
                 break;
 
+        case BIO_C_NREAD0:
+                /* prepare for non-copying read */
+                ret = (long) bio_nread0(bio, ptr);
+                break;
+                
         case BIO_C_NREAD:
                 /* non-copying read */
                 ret = (long) bio_nread(bio, ptr, (size_t) num);