Changeset 105945 in vbox for trunk/src/libs/openssl-3.1.7/crypto/o_str.c

Timestamp:

Sep 4, 2024 11:32:47 AM (8 months ago)

Author:

vboxsync

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

164679

Message:

openssl-3.1.7: Applied and adjusted our OpenSSL changes to 3.1.7. bugref:10757

Location:

trunk/src/libs/openssl-3.1.7

Files:

• . (modified) (1 prop)
• crypto/o_str.c (modified) (4 diffs)

trunk/src/libs/openssl-3.1.7

@@ -25 +25 @@
 /vendor/openssl/3.0.3:151497-151729
 /vendor/openssl/3.0.7:154371
+/vendor/openssl/3.1.7:164675-164677

@@ -25 +25 @@
 /vendor/openssl/3.0.3:151497-151729
 /vendor/openssl/3.0.7:154371
+/vendor/openssl/3.1.7:164675-164677

trunk/src/libs/openssl-3.1.7/crypto/o_str.c

@@ -1 +1 @@
 /*
- * Copyright 2003-2022 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2003-2024 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -230 +230 @@
     size_t len = has_sep ? buflen * 3 : 1 + buflen * 2;
 
+    if (len == 0)
+        ++len;
     if (strlength != NULL)
         *strlength = len;
@@ -235 +237 @@
         return 1;
 
-    if (str_n < (unsigned long)len) {
+    if (str_n < len) {
         ERR_raise(ERR_LIB_CRYPTO, CRYPTO_R_TOO_SMALL_BUFFER);
         return 0;
@@ -247 +249 @@
             *q++ = sep;
     }
-    if (has_sep)
+    if (has_sep && buflen > 0)
         --q;
     *q = CH_ZERO;
 
 #ifdef CHARSET_EBCDIC
-    ebcdic2ascii(str, str, q - str - 1);
+    ebcdic2ascii(str, str, q - str);
 #endif
     return 1;

@@ -25 +25 @@
 /vendor/openssl/3.0.3:151497-151729
 /vendor/openssl/3.0.7:154371
+/vendor/openssl/3.1.7:164675-164677