From: Matt Caswell <matt@openssl.org>
Date: Tue, 31 Oct 2023 16:24:44 +0000 (+0000)
Subject: Don't create an ack frame if one isn't wanted for this pn_space
X-Git-Tag: openssl-3.3.0-alpha1~698
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d13488b93690121bd50c97599760a19ead6bcd1f;p=thirdparty%2Fopenssl.git

Don't create an ack frame if one isn't wanted for this pn_space

The txp->want_ack value has different bit values for different pn_space
values. Make sure we take that into account when we read it.

Fixes #22568

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

diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c
index ce59900f147..2af385af0f3 100644
--- a/ssl/quic/quic_txp.c
+++ b/ssl/quic/quic_txp.c
@@ -1786,7 +1786,7 @@ static int txp_generate_pre_token(OSSL_QUIC_TX_PACKETISER *txp,
     /* ACK Frames (Regenerate) */
     if (a->allow_ack
         && tx_helper_get_space_left(h) >= MIN_FRAME_SIZE_ACK
-        && (txp->want_ack
+        && (((txp->want_ack & (1UL << pn_space)) != 0)
             || ossl_ackm_is_ack_desired(txp->args.ackm, pn_space))
         && (ack = ossl_ackm_get_ack_frame(txp->args.ackm, pn_space)) != NULL) {
         WPACKET *wpkt = tx_helper_begin(h);