diff options
| author | Hugo Landau <hlandau@openssl.org> | 2023-05-23 12:23:05 +0100 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2023-06-16 09:26:27 +1000 |
| commit | b65b0d4ebe67ba9d53b96887b54ca9a0f5bf523e (patch) | |
| tree | d873d844c4de956de7e95071bf237b110a08bdd6 /ssl/quic | |
| parent | a3a51d6ec38a8c2fd88e7c64c2f21632e55cbbdf (diff) | |
QUIC TXP: Remove TX key update handling from TXP
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/21029)
Diffstat (limited to 'ssl/quic')
| -rw-r--r-- | ssl/quic/quic_txp.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/ssl/quic/quic_txp.c b/ssl/quic/quic_txp.c index 8626ac4576..f117b246aa 100644 --- a/ssl/quic/quic_txp.c +++ b/ssl/quic/quic_txp.c @@ -1935,7 +1935,7 @@ static int txp_generate_for_el_actual(OSSL_QUIC_TX_PACKETISER *txp, goto fatal_err; /* Maximum PN reached? */ - if (txp->next_pn[pn_space] >= (((QUIC_PN)1) << 62)) + if (!ossl_quic_pn_valid(txp->next_pn[pn_space])) goto fatal_err; if ((tpkt = ossl_quic_txpim_pkt_alloc(txp->args.txpim)) == NULL) @@ -2191,18 +2191,6 @@ static int txp_generate_for_el_actual(OSSL_QUIC_TX_PACKETISER *txp, pkt.pn = txp->next_pn[pn_space]; pkt.flags = OSSL_QTX_PKT_FLAG_COALESCE; /* always try to coalesce */ - /* Do TX key update if needed. */ - if (enc_level == QUIC_ENC_LEVEL_1RTT) { - uint64_t cur_pkt_count, max_pkt_count; - - cur_pkt_count = ossl_qtx_get_cur_epoch_pkt_count(txp->args.qtx, enc_level); - max_pkt_count = ossl_qtx_get_max_epoch_pkt_count(txp->args.qtx, enc_level); - - if (cur_pkt_count >= max_pkt_count / 2) - if (!ossl_qtx_trigger_key_update(txp->args.qtx)) - goto fatal_err; - } - if (!ossl_assert(h.bytes_appended > 0)) goto fatal_err; |