From: Hugo Landau <hlandau@openssl.org>
Date: Thu, 1 Feb 2024 11:00:55 +0000 (+0000)
Subject: QUIC QLOG: Use set0
X-Git-Tag: openssl-3.3.0-alpha1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b58abf982218c704801d8a7b0f5725b730c94671;p=thirdparty%2Fopenssl.git

QUIC QLOG: Use set0

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/include/internal/quic_fifd.h b/include/internal/quic_fifd.h
index 606147c1db8..0f5462c2a34 100644
--- a/include/internal/quic_fifd.h
+++ b/include/internal/quic_fifd.h
@@ -78,7 +78,7 @@ void ossl_quic_fifd_cleanup(QUIC_FIFD *fifd); /* (no-op) */
 
 int ossl_quic_fifd_pkt_commit(QUIC_FIFD *fifd, QUIC_TXPIM_PKT *pkt);
 
-void ossl_quic_fifd_set_qlog(QUIC_FIFD *fifd, QLOG *qlog);
+void ossl_quic_fifd_set0_qlog(QUIC_FIFD *fifd, QLOG *qlog);
 
 # endif
 
diff --git a/include/internal/quic_record_tx.h b/include/internal/quic_record_tx.h
index 18f7b23700a..46f61a2e589 100644
--- a/include/internal/quic_record_tx.h
+++ b/include/internal/quic_record_tx.h
@@ -69,7 +69,7 @@ void ossl_qtx_set_msg_callback(OSSL_QTX *qtx, ossl_msg_cb msg_callback,
 void ossl_qtx_set_msg_callback_arg(OSSL_QTX *qtx, void *msg_callback_arg);
 
 /* Change QLOG instance in use after instantiation. */
-void ossl_qtx_set_qlog(OSSL_QTX *qtx, QLOG *qlog);
+void ossl_qtx_set0_qlog(OSSL_QTX *qtx, QLOG *qlog);
 
 /*
  * Secret Management
diff --git a/include/internal/quic_txp.h b/include/internal/quic_txp.h
index b1769b15e48..a6d38a2ba9e 100644
--- a/include/internal/quic_txp.h
+++ b/include/internal/quic_txp.h
@@ -141,8 +141,8 @@ int ossl_quic_tx_packetiser_set_peer(OSSL_QUIC_TX_PACKETISER *txp,
 /*
  * Change the QLOG instance in use after instantiation.
  */
-void ossl_quic_tx_packetiser_set_qlog(OSSL_QUIC_TX_PACKETISER *txp,
-                                      QLOG *qlog);
+void ossl_quic_tx_packetiser_set0_qlog(OSSL_QUIC_TX_PACKETISER *txp,
+                                       QLOG *qlog);
 
 /*
  * Inform the TX packetiser that an EL has been discarded. Idempotent.
diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c
index 49d1121392f..c77bcf4a917 100644
--- a/ssl/quic/quic_channel.c
+++ b/ssl/quic/quic_channel.c
@@ -3331,8 +3331,8 @@ int ossl_quic_channel_on_new_conn(QUIC_CHANNEL *ch, const BIO_ADDR *peer,
         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));
+    ossl_qtx_set0_qlog(ch->qtx, ch_get_qlog(ch));
+    ossl_quic_tx_packetiser_set0_qlog(ch->txp, ch_get_qlog(ch));
 
     /* Plug in secrets for the Initial EL. */
     if (!ossl_quic_provide_initial_secret(ch->port->engine->libctx,
diff --git a/ssl/quic/quic_fifd.c b/ssl/quic/quic_fifd.c
index fc268c54204..0abc8cb6287 100644
--- a/ssl/quic/quic_fifd.c
+++ b/ssl/quic/quic_fifd.c
@@ -294,7 +294,7 @@ int ossl_quic_fifd_pkt_commit(QUIC_FIFD *fifd, QUIC_TXPIM_PKT *pkt)
     return ossl_ackm_on_tx_packet(fifd->ackm, &pkt->ackm_pkt);
 }
 
-void ossl_quic_fifd_set_qlog(QUIC_FIFD *fifd, QLOG *qlog)
+void ossl_quic_fifd_set0_qlog(QUIC_FIFD *fifd, QLOG *qlog)
 {
     fifd->qlog = qlog;
 }
diff --git a/ssl/quic/quic_record_tx.c b/ssl/quic/quic_record_tx.c
index 663b1637273..5d6b84d98ff 100644
--- a/ssl/quic/quic_record_tx.c
+++ b/ssl/quic/quic_record_tx.c
@@ -167,7 +167,7 @@ void ossl_qtx_set_mutator(OSSL_QTX *qtx, ossl_mutate_packet_cb mutatecb,
     qtx->mutatearg      = mutatearg;
 }
 
-void ossl_qtx_set_qlog(OSSL_QTX *qtx, QLOG *qlog)
+void ossl_qtx_set0_qlog(OSSL_QTX *qtx, QLOG *qlog)
 {
     qtx->qlog = qlog;
 }
diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c
index 9ed1858e0fb..1327ba83bbe 100644
--- a/ssl/quic/quic_txp.c
+++ b/ssl/quic/quic_txp.c
@@ -626,10 +626,10 @@ void ossl_quic_tx_packetiser_set_ack_tx_cb(OSSL_QUIC_TX_PACKETISER *txp,
     txp->ack_tx_cb_arg  = cb_arg;
 }
 
-void ossl_quic_tx_packetiser_set_qlog(OSSL_QUIC_TX_PACKETISER *txp,
-                                      QLOG *qlog)
+void ossl_quic_tx_packetiser_set0_qlog(OSSL_QUIC_TX_PACKETISER *txp,
+                                       QLOG *qlog)
 {
-    ossl_quic_fifd_set_qlog(&txp->fifd, qlog);
+    ossl_quic_fifd_set0_qlog(&txp->fifd, qlog);
 }
 
 int ossl_quic_tx_packetiser_discard_enc_level(OSSL_QUIC_TX_PACKETISER *txp,