diff options
author | Michael Stapelberg <stapelberg@debian.org> | 2014-09-26 23:20:01 +0200 |
---|---|---|
committer | Michael Stapelberg <stapelberg@debian.org> | 2014-09-26 23:20:01 +0200 |
commit | f4fa1ef6e6ccd9264db61c6400528158e5913bda (patch) | |
tree | 0d9f077025369138011800c470f68abf72833b31 /src/pkg/crypto/tls/ticket.go | |
parent | 64f344c0c94601934187163f7b353d009dc1b63f (diff) | |
download | golang-upstream/1.3.2.tar.gz |
Imported Upstream version 1.3.2upstream/1.3.2
Diffstat (limited to 'src/pkg/crypto/tls/ticket.go')
-rw-r--r-- | src/pkg/crypto/tls/ticket.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/pkg/crypto/tls/ticket.go b/src/pkg/crypto/tls/ticket.go index 4cfc5a53f..0923027c7 100644 --- a/src/pkg/crypto/tls/ticket.go +++ b/src/pkg/crypto/tls/ticket.go @@ -153,7 +153,8 @@ func (c *Conn) encryptTicket(state *sessionState) ([]byte, error) { } func (c *Conn) decryptTicket(encrypted []byte) (*sessionState, bool) { - if len(encrypted) < aes.BlockSize+sha256.Size { + if c.config.SessionTicketsDisabled || + len(encrypted) < aes.BlockSize+sha256.Size { return nil, false } |