Minor fixes

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 ed0fa4ceaa36586da2db16243a82255d8610e77c..cc1f8395530953a061eba770d8396765748ddf6d 100644 (file)
--- a/ssl/quic/quic_impl.c
+++ b/ssl/quic/quic_impl.c
@@ -4308,7 +4308,9 @@ SSL *ossl_quic_new_listener_from(SSL *ssl, uint64_t flags)
 
     ql->domain  = ctx.qd;
     ql->engine  = ctx.qd->engine;
+#if defined(OPENSSL_THREADS)
     ql->mutex   = ctx.qd->mutex;
+#endif
 
     /* TODO(QUIC SERVER): Implement SSL_LISTENER_FLAG_NO_ACCEPT */
 

diff --git a/ssl/rio/build.info b/ssl/rio/build.info
index 33e0dc13adc26ba410918d07ea08a81c398e00fc..15f93fb07d5e935b84ad0cfe030d436768f85695 100644 (file)
--- a/ssl/rio/build.info
+++ b/ssl/rio/build.info
@@ -1,4 +1,6 @@
 $LIBSSL=../../libssl
 
 SOURCE[$LIBSSL]=poll_immediate.c
-SOURCE[$LIBSSL]=rio_notifier.c
+IF[{- !$disabled{quic} -}]
+  SOURCE[$LIBSSL]=rio_notifier.c
+ENDIF