Changeset 94082 in vbox for trunk/src/libs/openssl-3.0.1/crypto/bio/bf_buff.c

Timestamp:

Mar 3, 2022 7:17:34 PM (3 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

150325

Message:

libs/openssl-3.0.1: started applying and adjusting our OpenSSL changes to 3.0.1. bugref:10128

Location:

trunk/src/libs/openssl-3.0.1

Files:

• . (modified) (1 prop)
• crypto/bio/bf_buff.c (modified) (6 diffs)

trunk/src/libs/openssl-3.0.1

@@ -12 +12 @@
 /vendor/openssl/1.1.1c:131722-131725
 /vendor/openssl/1.1.1k:145841-145843
+/vendor/openssl/3.0.1:150323-150324
+/vendor/openssl/current:147554-150322

@@ -12 +12 @@
 /vendor/openssl/1.1.1c:131722-131725
 /vendor/openssl/1.1.1k:145841-145843
+/vendor/openssl/3.0.1:150323-150324
+/vendor/openssl/current:147554-150322

trunk/src/libs/openssl-3.0.1/crypto/bio/bf_buff.c

@@ -1 +1 @@
 /*
- * Copyright 1995-2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
@@ -26 +26 @@
     BIO_TYPE_BUFFER,
     "buffer",
-    /* TODO: Convert to new style write function */
     bwrite_conv,
     buffer_write,
-    /* TODO: Convert to new style read function */
     bread_conv,
     buffer_read,
@@ -290 +288 @@
     case BIO_C_SET_BUFF_READ_DATA:
         if (num > ctx->ibuf_size) {
-            p1 = OPENSSL_malloc((int)num);
+            if (num <= 0)
+                return 0;
+            p1 = OPENSSL_malloc((size_t)num);
             if (p1 == NULL)
                 goto malloc_error;
@@ -319 +319 @@
         p2 = ctx->obuf;
         if ((ibs > DEFAULT_BUFFER_SIZE) && (ibs != ctx->ibuf_size)) {
-            p1 = OPENSSL_malloc((int)num);
+            if (num <= 0)
+                return 0;
+            p1 = OPENSSL_malloc((size_t)num);
             if (p1 == NULL)
                 goto malloc_error;
         }
         if ((obs > DEFAULT_BUFFER_SIZE) && (obs != ctx->obuf_size)) {
-            p2 = OPENSSL_malloc((int)num);
+            p2 = OPENSSL_malloc((size_t)num);
             if (p2 == NULL) {
                 if (p1 != ctx->ibuf)
@@ -405 +407 @@
     return ret;
  malloc_error:
-    BIOerr(BIO_F_BUFFER_CTRL, ERR_R_MALLOC_FAILURE);
+    ERR_raise(ERR_LIB_BIO, ERR_R_MALLOC_FAILURE);
     return 0;
 }
@@ -411 +413 @@
 static long buffer_callback_ctrl(BIO *b, int cmd, BIO_info_cb *fp)
 {
-    long ret = 1;
-
     if (b->next_bio == NULL)
         return 0;
-    switch (cmd) {
-    default:
-        ret = BIO_callback_ctrl(b->next_bio, cmd, fp);
-        break;
-    }
-    return ret;
+    return BIO_callback_ctrl(b->next_bio, cmd, fp);
 }
 

@@ -12 +12 @@
 /vendor/openssl/1.1.1c:131722-131725
 /vendor/openssl/1.1.1k:145841-145843
+/vendor/openssl/3.0.1:150323-150324
+/vendor/openssl/current:147554-150322