Commit 81d84030f4 for openssl.org
commit 81d84030f432322afa28a858a6756b23d606d921
Author: Daniel Kubec <kubec@openssl.foundation>
Date: Wed Aug 26 13:24:20 2026 +0200
Fix build warnings in quic_srtm.c
ssl/quic/quic_srtm.c: the SRTM invariant-check helpers use several
variables only inside assert() calls, so they trigger unused-variable
warnings when assertions are compiled out. Mark them ossl_unused.
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
Reviewed-by: Milan Broz <mbroz@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Merge-date: Wed Aug 26 12:38:35 2026
Merged-from: https://github.com/openssl/openssl/pull/32510
(cherry picked from commit 5b09bb7d1159a31a7ae0a8f654262dc8858b95c8)
diff --git a/ssl/quic/quic_srtm.c b/ssl/quic/quic_srtm.c
index 4c8ea10734..957a3d79d6 100644
--- a/ssl/quic/quic_srtm.c
+++ b/ssl/quic/quic_srtm.c
@@ -493,8 +493,8 @@ static void check_mark(SRTM_ITEM *item, void *arg)
{
struct check_args *arg_ = arg;
uint32_t token = arg_->token;
- uint64_t prev_seq_num = 0;
- void *prev_opaque = NULL;
+ ossl_unused uint64_t prev_seq_num = 0;
+ ossl_unused void *prev_opaque = NULL;
int have_prev = 0;
assert(item != NULL);
@@ -522,7 +522,7 @@ static void check_mark(SRTM_ITEM *item, void *arg)
static void check_count(SRTM_ITEM *item, void *arg)
{
struct check_args *arg_ = arg;
- uint32_t token = arg_->token;
+ ossl_unused uint32_t token = arg_->token;
assert(item != NULL);
@@ -543,7 +543,8 @@ void ossl_quic_srtm_check(const QUIC_SRTM *srtm)
{
#ifdef FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION
struct check_args args = { 0 };
- size_t tokens_expected, tokens_expected_old;
+ size_t tokens_expected;
+ ossl_unused size_t tokens_expected_old;
args.token = token_next;
++token_next;