diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-02-22 08:14:07 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2017-03-10 14:48:40 +0000 |
| commit | 0b1f26648671b94e2ae3e11d602556a4e46535ce (patch) | |
| tree | 66b172d170c863e1b8c97cbf03aad41a1d26257c /ssl/t1_lib.c | |
| parent | e5fd8ca43beeb40d33d421b519fb7e1d20358b94 (diff) | |
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)
Diffstat (limited to 'ssl/t1_lib.c')
| -rw-r--r-- | ssl/t1_lib.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 5ab7223476..22a368defe 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -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 |