From: Hugo Landau <hlandau@openssl.org>
Date: Mon, 29 Jan 2024 12:36:52 +0000 (+0000)
Subject: QUIC CHANNEL: Ensure QLOG instance is used correctly on server side
X-Git-Tag: openssl-3.3.0-alpha1~189
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c55e144b89fc8f917a897bf0756d85d3ce372160;p=thirdparty%2Fopenssl.git

QUIC CHANNEL: Ensure QLOG instance is used correctly on server side

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

diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c
index ff394bbe722..49d1121392f 100644
--- a/ssl/quic/quic_channel.c
+++ b/ssl/quic/quic_channel.c
@@ -3330,6 +3330,10 @@ int ossl_quic_channel_on_new_conn(QUIC_CHANNEL *ch, const BIO_ADDR *peer,
     if (!ossl_quic_tx_packetiser_set_cur_scid(ch->txp, &ch->cur_local_cid))
         return 0;
 
+    /* Setup QLOG, which did not happen earlier due to lacking an Initial ODCID. */
+    ossl_qtx_set_qlog(ch->qtx, ch_get_qlog(ch));
+    ossl_quic_tx_packetiser_set_qlog(ch->txp, ch_get_qlog(ch));
+
     /* Plug in secrets for the Initial EL. */
     if (!ossl_quic_provide_initial_secret(ch->port->engine->libctx,
                                           ch->port->engine->propq,