From e694476ffaaf2b50b92ce1a57126778733b47ce6 Mon Sep 17 00:00:00 2001 From: Martin Thomson Date: Wed, 3 Jun 2020 16:38:47 +1000 Subject: [PATCH] Narrow allowed CONNECTION_CLOSE in Initial/Handshake When we prohibited the use of application-layer CONNECTION_CLOSE in these packets, we should have updated the text in the description of the packets also. Closes #3713. --- draft-ietf-quic-transport.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/draft-ietf-quic-transport.md b/draft-ietf-quic-transport.md index 40b70c5df4..a984c31a86 100644 --- a/draft-ietf-quic-transport.md +++ b/draft-ietf-quic-transport.md @@ -4354,9 +4354,9 @@ require multiple round trips or retransmissions of this data. The payload of an Initial packet includes a CRYPTO frame (or frames) containing a cryptographic handshake message, ACK frames, or both. PING, PADDING, and -CONNECTION_CLOSE frames are also permitted. An endpoint that receives an -Initial packet containing other frames can either discard the packet as spurious -or treat it as a connection error. +CONNECTION_CLOSE frames of type 0x1c are also permitted. An endpoint that +receives an Initial packet containing other frames can either discard the +packet as spurious or treat it as a connection error. The first packet sent by a client always includes a CRYPTO frame that contains the start or all of the first cryptographic handshake message. The first @@ -4482,9 +4482,9 @@ Handshake packets are their own packet number space, and thus the first Handshake packet sent by a server contains a packet number of 0. The payload of this packet contains CRYPTO frames and could contain PING, -PADDING, or ACK frames. Handshake packets MAY contain CONNECTION_CLOSE frames. -Endpoints MUST treat receipt of Handshake packets with other frames as a -connection error. +PADDING, or ACK frames. Handshake packets MAY contain CONNECTION_CLOSE frames +of type 0x1c. Endpoints MUST treat receipt of Handshake packets with other +frames as a connection error. Like Initial packets (see {{discard-initial}}), data in CRYPTO frames for Handshake packets is discarded - and no longer retransmitted - when Handshake