mirrors/utls
1
0
Fork 0
mirror of https://github.com/refraction-networking/utls.git synced 2025-04-03 20:17:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

crypto/tls: fix TestVerifyHostnameResumed

Browse source 
In TLS 1.3 session tickets are delivered after the handshake, and it
looks like now the Google servers wait until the first flight of data to
send them (or our timeout is too low). Cause some data to be sent so we
can avoid the guessing game.

Fixes #32090

Change-Id: I54af4acb3a89cc70c9e14a5dfe18a44c29a841a7
Reviewed-on: https://go-review.googlesource.com/c/go/+/177877
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
This commit is contained in:
Filippo Valsorda 2019-05-17 12:00:05 -04:00
parent 28958b0da6
commit 124c83f5c2
1 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

15
tls_test.go
View file

@ -372,7 +372,9 @@ func testVerifyHostnameResumed(t *testing.T, version uint16) {
ClientSessionCache: NewLRUClientSessionCache(32),
}
for i := 0; i < 2; i++ {
c, err := Dial("tcp", "mail.google.com:https", config)
c, err := DialWithDialer(&net.Dialer{
Timeout: 10 * time.Second,
}, "tcp", "mail.google.com:https", config)
if err != nil {
t.Fatalf("Dial #%d: %v", i, err)
}
@ -389,12 +391,13 @@ func testVerifyHostnameResumed(t *testing.T, version uint16) {
if err := c.VerifyHostname("mail.google.com"); err != nil {
t.Fatalf("verify mail.google.com #%d: %v", i, err)
}
// Give the client a chance to read the server session tickets.
c.SetReadDeadline(time.Now().Add(500 * time.Millisecond))
// Have the server send some data so session tickets are delivered.
c.SetDeadline(time.Now().Add(5 * time.Second))
if _, err := io.WriteString(c, "HEAD / HTTP/1.0\n\n"); err != nil {
t.Fatal(err)
}
if _, err := c.Read(make([]byte, 1)); err != nil {
if err, ok := err.(net.Error); !ok || !err.Timeout() {
t.Fatal(err)
}
t.Fatal(err)
}
c.Close()
}