From f4fa1ef6e6ccd9264db61c6400528158e5913bda Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Fri, 26 Sep 2014 23:20:01 +0200 Subject: Imported Upstream version 1.3.2 --- src/pkg/crypto/tls/ticket.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/pkg/crypto/tls/ticket.go') 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 } -- cgit v1.2.3