Commit 449ef4b7a5 for openssl.org
commit 449ef4b7a57bfb22b38527e57b714de71cfde7dd
Author: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sat Aug 29 00:09:39 2026 +0900
QUIC: clarify SSL_listen_ex() ex data retention
Refer directly to application ex data stored on new_conn, avoiding
terminology tied to the internal QUIC object layout.
Restore the original quic_local.h copyright line since the file is
not modified.
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Saša NedvÄ›dický <sashan@openssl.org>
Merge-date: Tue Sep 1 14:19:19 2026
Merged-from: https://github.com/openssl/openssl/pull/32491
diff --git a/doc/man3/SSL_new_listener.pod b/doc/man3/SSL_new_listener.pod
index eeef4a7b65..62e43b8ae3 100644
--- a/doc/man3/SSL_new_listener.pod
+++ b/doc/man3/SSL_new_listener.pod
@@ -160,9 +160,9 @@ Certificates, verification parameters, ciphersuites, ALPN configuration and
other security policy must be configured on the listener's
B<SSL_CTX>. The connection is reset to accepted-connection defaults. TLS
callbacks and QUIC message tracing callbacks are derived from the listener.
-Except for application ex data associated with the outer SSL object,
-applications must not rely on configuration applied to I<new_conn> before the
-call being retained; configure it on the listener or after SSL_listen_ex()
+Application ex data set on I<new_conn> is retained. Applications must not rely
+on any other configuration applied to I<new_conn> before the call being
+retained. Configure such settings on the listener or after SSL_listen_ex()
succeeds. Applications must not call L<SSL_set_bio(3)> or L<SSL_set_fd(3)> to
install a private connected BIO or file descriptor on the returned connection;
it continues to use the listener's shared network port.
diff --git a/ssl/quic/quic_local.h b/ssl/quic/quic_local.h
index 4f4a864fab..0c8594b315 100644
--- a/ssl/quic/quic_local.h
+++ b/ssl/quic/quic_local.h
@@ -1,5 +1,5 @@
/*
- * Copyright 2022-2026 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2022-2025 The OpenSSL Project Authors. All Rights Reserved.
*
* Licensed under the Apache License 2.0 (the "License"). You may not use
* this file except in compliance with the License. You can obtain a copy