From 2811331d5dfafd6cbe4fc28faa28993f3b19ab0b Mon Sep 17 00:00:00 2001 From: Ryan Granger Date: Fri, 11 Oct 2024 16:53:56 +0000 Subject: [PATCH] crypto/tls: include close notify in client tls test recordings This commit fixes the issue where tls testdata recordings made with the newer version of the prerecorded tls conversation test harness, doesn't end up capturing the final close notify message. The fix simply ensures that the tls.Client closes before the recording of the conversation is closed. The closing of the client connection directly is no longer needed when updating the recording since it will be closed when the tls.Client is closed. Fixes golang/go#69846 Change-Id: I93898de32abd89659a32ed240df6daea5aeaa7fc Reviewed-on: https://go-review.googlesource.com/c/go/+/620395 Reviewed-by: Michael Knyszek Reviewed-by: Filippo Valsorda Auto-Submit: Filippo Valsorda LUCI-TryBot-Result: Go LUCI Reviewed-by: Dmitri Shuralyov --- handshake_client_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/handshake_client_test.go b/handshake_client_test.go index 501f9c6..c001822 100644 --- a/handshake_client_test.go +++ b/handshake_client_test.go @@ -433,7 +433,7 @@ func (test *clientTest) run(t *testing.T, write bool) { } if write { - clientConn.Close() + client.Close() path := test.dataPath() out, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644) if err != nil {