From: Matt Caswell <matt@openssl.org>
Date: Mon, 13 Mar 2023 17:58:19 +0000 (+0000)
Subject: Make sure the QRX and QTX are associated with a libctx
X-Git-Tag: openssl-3.2.0-alpha1~1133
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c2212dc19eb280e22bda7d0538b23eef0be040e9;p=thirdparty%2Fopenssl.git

Make sure the QRX and QTX are associated with a libctx

If a libctx has been associated with the channel, it must be passed down
to the QRX and QTX.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20514)
---

diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c
index 7b79e9e5006..984ee871b2f 100644
--- a/ssl/quic/quic_channel.c
+++ b/ssl/quic/quic_channel.c
@@ -111,6 +111,7 @@ static int ch_init(QUIC_CHANNEL *ch)
         goto err;
 
     /* We plug in a network write BIO to the QTX later when we get one. */
+    qtx_args.libctx = ch->libctx;
     qtx_args.mdpl = QUIC_MIN_INITIAL_DGRAM_LEN;
     ch->rx_max_udp_payload_size = qtx_args.mdpl;
 
@@ -192,6 +193,7 @@ static int ch_init(QUIC_CHANNEL *ch)
                                             ch_default_packet_handler,
                                             ch);
 
+    qrx_args.libctx             = ch->libctx;
     qrx_args.demux              = ch->demux;
     qrx_args.short_conn_id_len  = rx_short_cid_len;
     qrx_args.max_deferred       = 32;