QUIC APL: Use domain flag to determine thread assisted mode

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/24971)

diff --git a/ssl/quic/quic_impl.c b/ssl/quic/quic_impl.c
index 6820b2d7f53016322458e5c2bd4d37fda1e9d52f..ff2b17d7e398ce507de392380fe070d319ad2ec2 100644 (file)
--- a/ssl/quic/quic_impl.c
+++ b/ssl/quic/quic_impl.c
@@ -607,7 +607,7 @@ SSL *ossl_quic_new(SSL_CTX *ctx)
     /* Determine mode of operation. */
 #if !defined(OPENSSL_NO_QUIC_THREAD_ASSIST)
     qc->is_thread_assisted
-        = (ctx->method == OSSL_QUIC_client_thread_method());
+        = ((ctx->domain_flags & SSL_DOMAIN_FLAG_THREAD_ASSISTED) != 0);
 #endif
 
     qc->as_server       = 0; /* TODO(QUIC SERVER): add server support */

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index e41d32bdf015495917520d94e0cee8b360a0cd92..0916b31202e57fb8d7e5cf9216a67afa88b223d3 100644 (file)
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -8013,6 +8013,18 @@ int SSL_CTX_set_domain_flags(SSL_CTX *ctx, uint64_t domain_flags)
             return 0;
         }
 
+        /*
+         * Note: We treat MULTI_THREAD as a no-op in non-threaded builds, but
+         * not THREAD_ASSISTED.
+         */
+# ifndef OPENSSL_THREADS
+        if ((domain_flags & SSL_DOMAIN_FLAG_THREAD_ASSISTED) != 0) {
+            ERR_raise_data(ERR_LIB_SSL, ERR_R_UNSUPPORTED,
+                           "thread assisted mode not available in this build");
+            return 0;
+        }
+# endif
+
         ctx->domain_flags = domain_flags;
         return 1;
     }