From 9bbc5b54b0f0c64d21eaea35ee3f9722aa77a56e Mon Sep 17 00:00:00 2001 From: Hugo Landau Date: Wed, 30 Nov 2022 07:57:55 +0000 Subject: [PATCH] QUIC CHANNEL: Revise inaccurate comments Reviewed-by: Tomas Mraz Reviewed-by: Matt Caswell (Merged from https://github.com/openssl/openssl/pull/19703) --- ssl/quic/quic_channel.c | 2 +- ssl/quic/quic_channel_local.h | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ssl/quic/quic_channel.c b/ssl/quic/quic_channel.c index b0752cda790..87406f4ee35 100644 --- a/ssl/quic/quic_channel.c +++ b/ssl/quic/quic_channel.c @@ -1529,7 +1529,7 @@ int ossl_quic_channel_on_handshake_confirmed(QUIC_CHANNEL *ch) * - If we are already TERMINATED this is a no-op. * * - If we are TERMINATING - CLOSING and we have now got a CONNECTION_CLOSE - * from the peer (tcause->remote == 1), we move to TERMINATING - CLOSING. + * from the peer (tcause->remote == 1), we move to TERMINATING - DRAINING. * * - If we are TERMINATING - DRAINING, we remain here until the terminating * timer expires. diff --git a/ssl/quic/quic_channel_local.h b/ssl/quic/quic_channel_local.h index 269781688f6..a16422e6e19 100644 --- a/ssl/quic/quic_channel_local.h +++ b/ssl/quic/quic_channel_local.h @@ -246,9 +246,12 @@ struct quic_channel_st { unsigned int have_qsm : 1; /* - * Preferred EL for transmission. This is not strictly needed as it can be - * inferred from what keys we have provisioned, but makes determining the - * current EL simpler and faster. + * Preferred ELs for transmission and reception. This is not strictly needed + * as it can be inferred from what keys we have provisioned, but makes + * determining the current EL simpler and faster. A separate EL for + * transmission and reception is not strictly necessary but makes things + * easier for interoperation with the handshake layer, which likes to invoke + * the yield secret callback at different times for TX and RX. */ unsigned int tx_enc_level : 3; unsigned int rx_enc_level : 3; -- 2.47.2