Rename msg_callback_s to msg_callback_ssl for greater clarity

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Hugo Landau <hlandau@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/20914)

diff --git a/include/internal/quic_channel.h b/include/internal/quic_channel.h
index 74ee125f342ee297ea441d5fa687244cc5dc8446..25b6758d8d14e11f5dd4b922350e40e2a2cc6d4f 100644 (file)
--- a/include/internal/quic_channel.h
+++ b/include/internal/quic_channel.h
@@ -326,7 +326,7 @@ int ossl_quic_channel_replace_local_cid(QUIC_CHANNEL *ch,
 /* Setters for the msg_callback and msg_callback_arg */
 void ossl_quic_channel_set_msg_callback(QUIC_CHANNEL *ch,
                                         ossl_msg_cb msg_callback,
-                                        SSL *msg_callback_s);
+                                        SSL *msg_callback_ssl);
 void ossl_quic_channel_set_msg_callback_arg(QUIC_CHANNEL *ch,
                                             void *msg_callback_arg);
 

diff --git a/include/internal/quic_record_rx.h b/include/internal/quic_record_rx.h
index b86d9a98b5b0a39ebb26e26926094dca971501e7..ece16a3bfc9a234cf6dcf6e6b7d62a9329150eb3 100644 (file)
--- a/include/internal/quic_record_rx.h
+++ b/include/internal/quic_record_rx.h
@@ -62,7 +62,7 @@ void ossl_qrx_free(OSSL_QRX *qrx);
 
 /* Setters for the msg_callback and msg_callback_arg */
 void ossl_qrx_set_msg_callback(OSSL_QRX *qrx, ossl_msg_cb msg_callback,
-                               SSL *msg_callback_s);
+                               SSL *msg_callback_ssl);
 void ossl_qrx_set_msg_callback_arg(OSSL_QRX *qrx,
                                    void *msg_callback_arg);
 

diff --git a/include/internal/quic_record_tx.h b/include/internal/quic_record_tx.h
index a12c3abe009a5fafa229adf95465ac7e85d0737c..8b4e1705cb8cae80a39951a106d8ef563378b6ca 100644 (file)
--- a/include/internal/quic_record_tx.h
+++ b/include/internal/quic_record_tx.h
@@ -60,7 +60,7 @@ void ossl_qtx_set_mutator(OSSL_QTX *qtx, ossl_mutate_packet_cb mutatecb,
 
 /* Setters for the msg_callback and the msg_callback_arg */
 void ossl_qtx_set_msg_callback(OSSL_QTX *qtx, ossl_msg_cb msg_callback,
-                               SSL *msg_callback_s);
+                               SSL *msg_callback_ssl);
 void ossl_qtx_set_msg_callback_arg(OSSL_QTX *qtx, void *msg_callback_arg);
 
 /*

diff --git a/include/internal/quic_txp.h b/include/internal/quic_txp.h
index ad1c06f31e86b1fe390f60cef6b6f515c34d93f5..b8740f5440573d6271b2a224e36c729988f16050 100644 (file)
--- a/include/internal/quic_txp.h
+++ b/include/internal/quic_txp.h
@@ -170,7 +170,7 @@ int ossl_quic_tx_packetiser_schedule_conn_close(OSSL_QUIC_TX_PACKETISER *txp,
 /* Setters for the msg_callback and msg_callback_arg */
 void ossl_quic_tx_packetiser_set_msg_callback(OSSL_QUIC_TX_PACKETISER *txp,
                                               ossl_msg_cb msg_callback,
-                                              SSL *msg_callback_s);
+                                              SSL *msg_callback_ssl);
 void ossl_quic_tx_packetiser_set_msg_callback_arg(OSSL_QUIC_TX_PACKETISER *txp,
                                                   void *msg_callback_arg);
 

diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c
index 328c8bee8bba65f05d27543e986832a8ac314778..d75ac4c3348a494bb4f6be9419222e2ee59cae14 100644 (file)
--- a/ssl/quic/quic_channel.c
+++ b/ssl/quic/quic_channel.c
@@ -2512,14 +2512,14 @@ int ossl_quic_channel_replace_local_cid(QUIC_CHANNEL *ch,
 
 void ossl_quic_channel_set_msg_callback(QUIC_CHANNEL *ch,
                                         ossl_msg_cb msg_callback,
-                                        SSL *msg_callback_s)
+                                        SSL *msg_callback_ssl)
 {
     ch->msg_callback = msg_callback;
-    ch->msg_callback_s = msg_callback_s;
-    ossl_qtx_set_msg_callback(ch->qtx, msg_callback, msg_callback_s);
+    ch->msg_callback_ssl = msg_callback_ssl;
+    ossl_qtx_set_msg_callback(ch->qtx, msg_callback, msg_callback_ssl);
     ossl_quic_tx_packetiser_set_msg_callback(ch->txp, msg_callback,
-                                             msg_callback_s);
-    ossl_qrx_set_msg_callback(ch->qrx, msg_callback, msg_callback_s);
+                                             msg_callback_ssl);
+    ossl_qrx_set_msg_callback(ch->qrx, msg_callback, msg_callback_ssl);
 }
 
 void ossl_quic_channel_set_msg_callback_arg(QUIC_CHANNEL *ch,

diff --git a/ssl/quic/quic_channel_local.h b/ssl/quic/quic_channel_local.h
index ad2c0b458a876def08f025f8932a930e50295eda..b945f3654211f33f0ff88453014ca3345b186f77 100644 (file)
--- a/ssl/quic/quic_channel_local.h
+++ b/ssl/quic/quic_channel_local.h
@@ -96,7 +96,7 @@ struct quic_channel_st {
     /* Message callback related arguments */
     ossl_msg_cb                     msg_callback;
     void                            *msg_callback_arg;
-    SSL                             *msg_callback_s;
+    SSL                             *msg_callback_ssl;
 
     /*
      * Send and receive parts of the crypto streams.

diff --git a/ssl/quic/quic_record_rx.c b/ssl/quic/quic_record_rx.c
index db70c119fa3ff441113f83963bd15c13cf9bbf48..fad678a41e84c887161a5a87ded68681193d2d3f 100644 (file)
--- a/ssl/quic/quic_record_rx.c
+++ b/ssl/quic/quic_record_rx.c
@@ -150,7 +150,7 @@ struct ossl_qrx_st {
     /* Message callback related arguments */
     ossl_msg_cb msg_callback;
     void *msg_callback_arg;
-    SSL *msg_callback_s;
+    SSL *msg_callback_ssl;
 };
 
 static void qrx_on_rx(QUIC_URXE *urxe, void *arg);
@@ -234,7 +234,8 @@ void ossl_qrx_inject_urxe(OSSL_QRX *qrx, QUIC_URXE *urxe)
 
     if (qrx->msg_callback != NULL)
         qrx->msg_callback(0, OSSL_QUIC1_VERSION, SSL3_RT_QUIC_DATAGRAM, urxe + 1,
-                          urxe->data_len, qrx->msg_callback_s, qrx->msg_callback_arg);
+                          urxe->data_len, qrx->msg_callback_ssl,
+                          qrx->msg_callback_arg);
 }
 
 static void qrx_on_rx(QUIC_URXE *urxe, void *arg)
@@ -845,7 +846,7 @@ static int qrx_process_pkt(OSSL_QRX *qrx, QUIC_URXE *urxe,
 
     if (qrx->msg_callback != NULL)
         qrx->msg_callback(0, OSSL_QUIC1_VERSION, SSL3_RT_QUIC_PACKET, sop,
-                          eop - sop - rxe->hdr.len, qrx->msg_callback_s,
+                          eop - sop - rxe->hdr.len, qrx->msg_callback_ssl,
                           qrx->msg_callback_arg);
 
     /*
@@ -1206,10 +1207,10 @@ uint64_t ossl_qrx_get_max_forged_pkt_count(OSSL_QRX *qrx,
 }
 
 void ossl_qrx_set_msg_callback(OSSL_QRX *qrx, ossl_msg_cb msg_callback,
-                               SSL *msg_callback_s)
+                               SSL *msg_callback_ssl)
 {
     qrx->msg_callback = msg_callback;
-    qrx->msg_callback_s = msg_callback_s;
+    qrx->msg_callback_ssl = msg_callback_ssl;
 }
 
 void ossl_qrx_set_msg_callback_arg(OSSL_QRX *qrx, void *msg_callback_arg)

diff --git a/ssl/quic/quic_record_tx.c b/ssl/quic/quic_record_tx.c
index 09862c77511d1bec24214cc6acf0448b905f2ca2..69a5ebea54b1ed714f8163bb9fcadcae7311363f 100644 (file)
--- a/ssl/quic/quic_record_tx.c
+++ b/ssl/quic/quic_record_tx.c
@@ -98,7 +98,7 @@ struct ossl_qtx_st {
     /* Message callback related arguments */
     ossl_msg_cb msg_callback;
     void *msg_callback_arg;
-    SSL *msg_callback_s;
+    SSL *msg_callback_ssl;
 };
 
 /* Instantiates a new QTX. */
@@ -452,7 +452,7 @@ static int qtx_write_hdr(OSSL_QTX *qtx, const QUIC_PKT_HDR *hdr, TXE *txe,
 
     if (qtx->msg_callback != NULL)
         qtx->msg_callback(1, OSSL_QUIC1_VERSION, SSL3_RT_QUIC_PACKET, data, l,
-                          qtx->msg_callback_s, qtx->msg_callback_arg);
+                          qtx->msg_callback_ssl, qtx->msg_callback_arg);
 
     txe->data_len += l;
 
@@ -911,7 +911,7 @@ int ossl_qtx_flush_net(OSSL_QTX *qtx)
             if (qtx->msg_callback != NULL)
                 qtx->msg_callback(1, OSSL_QUIC1_VERSION, SSL3_RT_QUIC_DATAGRAM,
                                 msg[i].data, msg[i].data_len,
-                                qtx->msg_callback_s,
+                                qtx->msg_callback_ssl,
                                 qtx->msg_callback_arg);
             qtx_pending_to_free(qtx);
         }
@@ -1004,10 +1004,10 @@ uint64_t ossl_qtx_get_max_epoch_pkt_count(OSSL_QTX *qtx, uint32_t enc_level)
 }
 
 void ossl_qtx_set_msg_callback(OSSL_QTX *qtx, ossl_msg_cb msg_callback,
-                               SSL *msg_callback_s)
+                               SSL *msg_callback_ssl)
 {
     qtx->msg_callback = msg_callback;
-    qtx->msg_callback_s = msg_callback_s;
+    qtx->msg_callback_ssl = msg_callback_ssl;
 }
 
 void ossl_qtx_set_msg_callback_arg(OSSL_QTX *qtx, void *msg_callback_arg)

diff --git a/ssl/quic/quic_rx_depack.c b/ssl/quic/quic_rx_depack.c
index 740f95f23a670980c032b9808d4e03b6534ffd1a..f22e658e8affe5f21d9e9287ec7b061a5318ad52 100644 (file)
--- a/ssl/quic/quic_rx_depack.c
+++ b/ssl/quic/quic_rx_depack.c
@@ -1107,7 +1107,7 @@ static int depack_process_frames(QUIC_CHANNEL *ch, PACKET *pkt,
             }
 
             ch->msg_callback(0, OSSL_QUIC1_VERSION, ctype, sof, framelen,
-                             ch->msg_callback_s, ch->msg_callback_arg);
+                             ch->msg_callback_ssl, ch->msg_callback_arg);
         }
     }
 

diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c
index b04fe011159f21f770dea1a18f610c1e20e2d774..24a123d1169fc8c2448eb65f09c491b325996a54 100644 (file)
--- a/ssl/quic/quic_txp.c
+++ b/ssl/quic/quic_txp.c
@@ -73,7 +73,7 @@ struct ossl_quic_tx_packetiser_st {
     /* Message callback related arguments */
     ossl_msg_cb msg_callback;
     void *msg_callback_arg;
-    SSL *msg_callback_s;
+    SSL *msg_callback_ssl;
 
 };
 
@@ -325,7 +325,7 @@ static int tx_helper_commit(struct tx_helper *h)
             ctype = SSL3_RT_QUIC_FRAME_HEADER;
 
         h->txp->msg_callback(1, OSSL_QUIC1_VERSION, ctype, h->txn.data, l,
-                             h->txp->msg_callback_s,
+                             h->txp->msg_callback_ssl,
                              h->txp->msg_callback_arg);
     }
 
@@ -2385,10 +2385,10 @@ int ossl_quic_tx_packetiser_schedule_conn_close(OSSL_QUIC_TX_PACKETISER *txp,
 
 void ossl_quic_tx_packetiser_set_msg_callback(OSSL_QUIC_TX_PACKETISER *txp,
                                               ossl_msg_cb msg_callback,
-                                              SSL *msg_callback_s)
+                                              SSL *msg_callback_ssl)
 {
     txp->msg_callback = msg_callback;
-    txp->msg_callback_s = msg_callback_s;
+    txp->msg_callback_ssl = msg_callback_ssl;
 }
 
 void ossl_quic_tx_packetiser_set_msg_callback_arg(OSSL_QUIC_TX_PACKETISER *txp,