QUIC TXP: Generate forced PINGs correctly

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

diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c
index 15095c7d9e8c0cff0da1964e0135fa7bc3d95181..1f3715e170740cc8e956a7da4e93b4bbbd20f574 100644 (file)
--- a/ssl/quic/quic_txp.c
+++ b/ssl/quic/quic_txp.c
@@ -2605,7 +2605,9 @@ static int txp_generate_for_el(OSSL_QUIC_TX_PACKETISER *txp,
     /* PING */
     tx_helper_unrestrict(h);
 
-    if (a.require_ack_eliciting && !have_ack_eliciting && a.allow_ping) {
+    if ((a.require_ack_eliciting
+         || (txp->force_ack_eliciting & (1UL << pn_space)) != 0)
+        && !have_ack_eliciting && a.allow_ping) {
         WPACKET *wpkt;
 
         wpkt = tx_helper_begin(h);