Fixup creation of qlog object

Changes for SSL_listen_ex squashed creation of qlog objects even when
configured.

Fix that up so qlog objects are created regardless of weather we use
SSL_accept_connection or SSL_listen_ex

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/27397)

diff --git a/ssl/quic/quic_port.c b/ssl/quic/quic_port.c
index 8043fde4ff19d77ad60fe924a09e197ab5ca0f7a..6f2be905721e322f3ca294a72b02faf1ae1ebf9a 100644 (file)
--- a/ssl/quic/quic_port.c
+++ b/ssl/quic/quic_port.c
@@ -542,18 +542,6 @@ static QUIC_CHANNEL *port_make_channel(QUIC_PORT *port, SSL *tls, OSSL_QRX *qrx,
              * We're using the normal SSL_accept_connection_path
              */
             ch->tls = port_new_handshake_layer(port, ch);
-#ifndef OPENSSL_NO_QLOG
-            /*
-             * If we're using qlog, make sure the tls get further configured properly
-             */
-            ch->use_qlog = 1;
-            if (ch->tls->ctx->qlog_title != NULL) {
-                if ((ch->qlog_title = OPENSSL_strdup(ch->tls->ctx->qlog_title)) == NULL) {
-                    OPENSSL_free(ch);
-                    return NULL;
-                }
-            }
-#endif
         } else {
             /*
              * We're deferring user ssl creation until SSL_accept_ex is called
@@ -561,6 +549,18 @@ static QUIC_CHANNEL *port_make_channel(QUIC_PORT *port, SSL *tls, OSSL_QRX *qrx,
             ch->tls = NULL;
         }
     }
+#ifndef OPENSSL_NO_QLOG
+    /*
+     * If we're using qlog, make sure the tls get further configured properly
+     */
+    ch->use_qlog = 1;
+    if (ch->tls->ctx->qlog_title != NULL) {
+        if ((ch->qlog_title = OPENSSL_strdup(ch->tls->ctx->qlog_title)) == NULL) {
+            OPENSSL_free(ch);
+            return NULL;
+        }
+    }
+#endif
 
     /*
      * And finally init the channel struct