diff options
author | Hugo Landau <hlandau@openssl.org> | 2024-01-29 12:36:52 +0000 |
---|---|---|
committer | Hugo Landau <hlandau@openssl.org> | 2024-02-02 11:50:29 +0000 |
commit | c55e144b89fc8f917a897bf0756d85d3ce372160 (patch) | |
tree | e708b7c474fc5b9f1c8693e9ac0ec3bccfaad32b | |
parent | 2acc1ebbd96afb5377af10cad6572617c906b06b (diff) |
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)
-rw-r--r-- | ssl/quic/quic_channel.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c index ff394bbe72..49d1121392 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, |