QUIC TXP: Generate forced PINGs correctly

Reviewed-by: Paul Dale <[email protected]> Reviewed-by: Tomas Mraz <[email protected]> (Merged from openssl#21458)
PHOENIXCONTACT · Jul 21, 2023 · 1e2e683 · 1e2e683
1 parent c206f2a
commit 1e2e683
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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);