Changeset 105945 in vbox for trunk/src/libs/openssl-3.1.7/crypto/bio/bio_lib.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/bio/bio_lib.c (modified) (2 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/bio/bio_lib.c

@@ -1 +1 @@
 /*
- * Copyright 1995-2023 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2024 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
@@ -870 +870 @@
 
 #ifndef OPENSSL_NO_SOCK
-    if (BIO_get_fd(bio, &fd) > 0 && fd < FD_SETSIZE)
-        return BIO_socket_wait(fd, BIO_should_read(bio), max_time);
+    if (BIO_get_fd(bio, &fd) > 0) {
+        int ret = BIO_socket_wait(fd, BIO_should_read(bio), max_time);
+
+        if (ret != -1)
+            return ret;
+    }
 #endif
     /* fall back to polling since no sockets are available */

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