bss_conn.c

Timestamp:

Nov 2, 2022 7:40:16 AM (2 years ago)

Author:

vboxsync

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

154372

Message:

libs: Switch to openssl-3.0.7, bugref:10317

Location:

trunk/src/libs/openssl-3.0.7

Files:

trunk/src/libs/openssl-3.0.7

Property svn:mergeinfo

-              r94082
+              r97372
 /*
  * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved.
+ *
  * Licensed under the Apache License 2.0 (the "License").  You may not use
 …
         case BIO_CONN_S_BLOCKED_CONNECT:
+            /* wait for socket being writable, before querying BIO_sock_error */
+            if (BIO_socket_wait(b->num, 0, time(NULL)) == 0)
+                break;
             i = BIO_sock_error(b->num);
             if (i != 0) {
 …
                 ret = 0;
                 goto exit_loop;
             } else
+            } else {
                 c->state = BIO_CONN_S_OK;
+# ifndef OPENSSL_NO_KTLS
+                /*
+                 * The new socket is created successfully regardless of ktls_enable.
+                 * ktls_enable doesn't change any functionality of the socket, except
+                 * changing the setsockopt to enable the processing of ktls_start.
+                 * Thus, it is not a problem to call it for non-TLS sockets.
+                 */
+                ktls_enable(b->num);
+# endif
+            }
             break;

Note: See TracChangeset for help on using the changeset viewer.