Commit 3151b035d1 for openssl.org
commit 3151b035d184faeb0943a79f8ed35f96ff4ee771
Author: Daniel Kubec <kubec@openssl.foundation>
Date: Thu Oct 29 15:37:30 2026 +0100
quic: Remove unused QUIC_SRT_ELEM type
struct quic_srt_elem_st is no longer defined after commit 3e4b8e8c5350
"QUIC CHANNEL: Remove obsolete SRT definitions", and the QUIC_SRT_ELEM
lhash, instantiated in quic_channel.c, has no users; stateless reset
tokens are tracked by QUIC_SRTM. Drop the typedef,
the DEFINE_LHASH_OF_EX() and the .clang-format type name.
Complements: 3e4b8e8c5350 "QUIC CHANNEL: Remove obsolete SRT definitions"
Assisted-by: Claude:claude-opus-5-5
Reviewed-by: Eugene Syromiatnikov <esyr@openssl.org>
Reviewed-by: Frederik Wedel-Heinen <fwh.openssl@gmail.com>
Merge-date: Sun Nov 1 15:58:52 2026
Merged-from: https://github.com/openssl/openssl/pull/33448
diff --git a/.clang-format b/.clang-format
index 07513306ec..0c39b721a4 100644
--- a/.clang-format
+++ b/.clang-format
@@ -871,7 +871,6 @@ TypeNames:
- "QUIC_REACTOR_WAIT_SLOT"
- "QUIC_RSTREAM"
- "QUIC_RXFC"
- - "QUIC_SRT_ELEM"
- "QUIC_SRT_GEN"
- "QUIC_SRTM"
- "QUIC_SSTREAM"
diff --git a/include/internal/quic_predef.h b/include/internal/quic_predef.h
index 485b07d5bf..34605d953c 100644
--- a/include/internal/quic_predef.h
+++ b/include/internal/quic_predef.h
@@ -20,7 +20,6 @@ typedef struct quic_fifd_st QUIC_FIFD;
typedef struct quic_cfq_st QUIC_CFQ;
typedef struct ossl_quic_tx_packetiser_st OSSL_QUIC_TX_PACKETISER;
typedef struct ossl_ackm_st OSSL_ACKM;
-typedef struct quic_srt_elem_st QUIC_SRT_ELEM;
typedef struct ossl_cc_data_st OSSL_CC_DATA;
typedef struct ossl_cc_method_st OSSL_CC_METHOD;
typedef struct quic_stream_map_st QUIC_STREAM_MAP;
diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c
index c45c772818..b9388a3f3c 100644
--- a/ssl/quic/quic_channel.c
+++ b/ssl/quic/quic_channel.c
@@ -89,8 +89,6 @@ static void ch_on_txp_ack_tx(const OSSL_QUIC_FRAME_ACK *ack, uint32_t pn_space,
void *arg);
static void ch_record_state_transition(QUIC_CHANNEL *ch, uint32_t new_state);
-DEFINE_LHASH_OF_EX(QUIC_SRT_ELEM);
-
typedef struct cfq_data_retire_cid {
uint64_t rtcid_seq;
QUIC_CHANNEL *rtcid_ch;