From ea5529de155cfd3f2c31698344b1ca001e0f8819 Mon Sep 17 00:00:00 2001 From: Joe Tsai Date: Thu, 23 Feb 2017 17:41:31 -0800 Subject: [PATCH] crypto/tls: use io.ReadFull in conn_test.go An io.Reader does not guarantee that it will read in the entire buffer. To ensure that property, io.ReadFull should be used instead. Change-Id: I0b863135ab9abc40e813f9dac07bfb2a76199950 Reviewed-on: https://go-review.googlesource.com/37403 Reviewed-by: Mikio Hara Run-TryBot: Mikio Hara TryBot-Result: Gobot Gobot --- src/crypto/tls/conn_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/crypto/tls/conn_test.go b/src/crypto/tls/conn_test.go index e58077e692..e27c5414b2 100644 --- a/src/crypto/tls/conn_test.go +++ b/src/crypto/tls/conn_test.go @@ -138,7 +138,7 @@ func runDynamicRecordSizingTest(t *testing.T, config *Config) { tlsConn := Client(clientConn, config) if err := tlsConn.Handshake(); err != nil { - t.Errorf("Error from client handshake: %s", err) + t.Errorf("Error from client handshake: %v", err) return } @@ -147,12 +147,12 @@ func runDynamicRecordSizingTest(t *testing.T, config *Config) { var recordSizes []int for { - n, err := clientConn.Read(recordHeader[:]) + n, err := io.ReadFull(clientConn, recordHeader[:]) if err == io.EOF { break } if err != nil || n != len(recordHeader) { - t.Errorf("Error from client read: %s", err) + t.Errorf("io.ReadFull = %d, %v", n, err) return } @@ -161,9 +161,9 @@ func runDynamicRecordSizingTest(t *testing.T, config *Config) { record = make([]byte, length) } - n, err = clientConn.Read(record[:length]) + n, err = io.ReadFull(clientConn, record[:length]) if err != nil || n != length { - t.Errorf("Error from client read: %s", err) + t.Errorf("io.ReadFull = %d, %v", n, err) return }