From: Pauli Date: Thu, 13 Jul 2023 04:26:26 +0000 (+1000) Subject: Add note about RFC 9000 10.2 persist time X-Git-Tag: openssl-3.2.0-alpha1~315 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a441d08b1b10f259c8fa9eb9cd836ffe19b23b0f;p=thirdparty%2Fopenssl.git Add note about RFC 9000 10.2 persist time Reviewed-by: Tim Hudson Reviewed-by: Hugo Landau (Merged from https://github.com/openssl/openssl/pull/21429) --- diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c index 5bae2e0a295..06277afa742 100644 --- a/ssl/quic/quic_channel.c +++ b/ssl/quic/quic_channel.c @@ -2547,6 +2547,11 @@ static void ch_start_terminating(QUIC_CHANNEL *ch, if (!force_immediate) { ch->state = tcause->remote ? QUIC_CHANNEL_STATE_TERMINATING_DRAINING : QUIC_CHANNEL_STATE_TERMINATING_CLOSING; + /* + * RFC 9000 s. 10.2 Immediate Close + * These states SHOULD persist for at least three times + * the current PTO interval as defined in [QUIC-RECOVERY]. + */ ch->terminate_deadline = ossl_time_add(get_time(ch), ossl_time_multiply(ossl_ackm_get_pto_duration(ch->ackm),