From: Hugo Landau <hlandau@openssl.org>
Date: Mon, 31 Oct 2022 16:03:25 +0000 (+0000)
Subject: QUIC TXP: Make discard_enc_level match documentation
X-Git-Tag: openssl-3.2.0-alpha1~1515
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=df038685644eb1bc4618f678b52fc22f0101235f;p=thirdparty%2Fopenssl.git

QUIC TXP: Make discard_enc_level match documentation

The documentation in the header file of the TXP stated that it is the
caller's responsibility to also notify the QTX of a discarded EL.
However, the implementation did not reflect this. Update the
implementation to reflect the intended design.

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/19703)
---

diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c
index 6224891a35b..5fa9070acd4 100644
--- a/ssl/quic/quic_txp.c
+++ b/ssl/quic/quic_txp.c
@@ -440,7 +440,6 @@ int ossl_quic_tx_packetiser_discard_enc_level(OSSL_QUIC_TX_PACKETISER *txp,
     if (enc_level != QUIC_ENC_LEVEL_0RTT)
         txp->args.crypto[ossl_quic_enc_level_to_pn_space(enc_level)] = NULL;
 
-    ossl_qtx_discard_enc_level(txp->args.qtx, enc_level);
     return 1;
 }