Commit ea5529de authored by Joe Tsai's avatar Joe Tsai Committed by Joe Tsai

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/37403Reviewed-by: default avatarMikio Hara <mikioh.mikioh@gmail.com>
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
parent abdb2c35
...@@ -138,7 +138,7 @@ func runDynamicRecordSizingTest(t *testing.T, config *Config) { ...@@ -138,7 +138,7 @@ func runDynamicRecordSizingTest(t *testing.T, config *Config) {
tlsConn := Client(clientConn, config) tlsConn := Client(clientConn, config)
if err := tlsConn.Handshake(); err != nil { if err := tlsConn.Handshake(); err != nil {
t.Errorf("Error from client handshake: %s", err) t.Errorf("Error from client handshake: %v", err)
return return
} }
...@@ -147,12 +147,12 @@ func runDynamicRecordSizingTest(t *testing.T, config *Config) { ...@@ -147,12 +147,12 @@ func runDynamicRecordSizingTest(t *testing.T, config *Config) {
var recordSizes []int var recordSizes []int
for { for {
n, err := clientConn.Read(recordHeader[:]) n, err := io.ReadFull(clientConn, recordHeader[:])
if err == io.EOF { if err == io.EOF {
break break
} }
if err != nil || n != len(recordHeader) { if err != nil || n != len(recordHeader) {
t.Errorf("Error from client read: %s", err) t.Errorf("io.ReadFull = %d, %v", n, err)
return return
} }
...@@ -161,9 +161,9 @@ func runDynamicRecordSizingTest(t *testing.T, config *Config) { ...@@ -161,9 +161,9 @@ func runDynamicRecordSizingTest(t *testing.T, config *Config) {
record = make([]byte, length) record = make([]byte, length)
} }
n, err = clientConn.Read(record[:length]) n, err = io.ReadFull(clientConn, record[:length])
if err != nil || n != length { if err != nil || n != length {
t.Errorf("Error from client read: %s", err) t.Errorf("io.ReadFull = %d, %v", n, err)
return return
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment