diff options
| author | Michael Stapelberg <stapelberg@debian.org> | 2014-09-26 23:20:11 +0200 |
|---|---|---|
| committer | Michael Stapelberg <stapelberg@debian.org> | 2014-09-26 23:20:11 +0200 |
| commit | 40fff9d31718d66485b576c0feeb439778d624e3 (patch) | |
| tree | bfa3bec31e846655c0a527af8c20810b1e11bfd3 /src/pkg/crypto/tls/handshake_server.go | |
| parent | 8907f7bcc6fd6be6a540717778b4f15bb24f6ecf (diff) | |
| parent | f4fa1ef6e6ccd9264db61c6400528158e5913bda (diff) | |
| download | golang-40fff9d31718d66485b576c0feeb439778d624e3.tar.gz | |
Merge tag 'upstream/1.3.2' into debian-sid
Upstream version 1.3.2
Diffstat (limited to 'src/pkg/crypto/tls/handshake_server.go')
| -rw-r--r-- | src/pkg/crypto/tls/handshake_server.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/pkg/crypto/tls/handshake_server.go b/src/pkg/crypto/tls/handshake_server.go index 75111eba0..dff6fd9ad 100644 --- a/src/pkg/crypto/tls/handshake_server.go +++ b/src/pkg/crypto/tls/handshake_server.go @@ -214,6 +214,10 @@ Curves: func (hs *serverHandshakeState) checkForResumption() bool { c := hs.c + if c.config.SessionTicketsDisabled { + return false + } + var ok bool if hs.sessionState, ok = c.decryptTicket(hs.clientHello.sessionTicket); !ok { return false |