Don't specially handle unauthenticated close_notify alerts

ctz · ctz · commit 0c6cd7ef6865 · 2024-04-19T15:01:47.000Z
diff --git a/rustls/src/common_state.rs b/rustls/src/common_state.rs
@@ -439,8 +439,8 @@ impl CommonState {
         }
 
         // If we get a CloseNotify, make a note to declare EOF to our
-        // caller.
-        if alert.description == AlertDescription::CloseNotify {
+        // caller.  But do not treat unauthenticated alerts like this.
+        if self.may_receive_application_data && alert.description == AlertDescription::CloseNotify {
             self.has_received_close_notify = true;
             return Ok(());
         }

Original file line number	Diff line number	Diff line change
`@@ -439,8 +439,8 @@ impl CommonState {`
`439`	`439`	`}`
`440`	`440`
`441`	`441`	`// If we get a CloseNotify, make a note to declare EOF to our`
`442`		`- // caller.`
`443`		`- if alert.description == AlertDescription::CloseNotify {`
	`442`	`+ // caller. But do not treat unauthenticated alerts like this.`
	`443`	`+ if self.may_receive_application_data && alert.description == AlertDescription::CloseNotify {`
`444`	`444`	`self.has_received_close_notify = true;`
`445`	`445`	`return Ok(());`
`446`	`446`	`}`