Fixup previous merge.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2703)
This commit is contained in:
Bernd Edlinger 2017-02-22 08:14:07 +01:00 committed by Matt Caswell
parent e5fd8ca43b
commit 0b1f266486

View file

@ -1316,7 +1316,7 @@ TICKET_RETURN tls_decrypt_ticket(SSL *s, const unsigned char *etick,
/* Some additional consistency checks */
if (p != sdec + slen || sess->session_id_length != 0) {
SSL_SESSION_free(sess);
return 2;
return TICKET_NO_DECRYPT;
}
/*
* The session ID, if non-empty, is used by some clients to detect