diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-02-13 18:36:13 +0100 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-02-14 14:37:59 -0500 |
| commit | 57b0d651f052ed86528da916397acbcce035fb21 (patch) | |
| tree | 6dc851c33931baa219c9149b53580d2951254c75 /ssl | |
| parent | 7f07149d25f8d7e00e9350ff2f064a4d25c1a13d (diff) | |
Use TLSEXT_KEYNAME_LENGTH in tls_decrypt_ticket.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2618)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/t1_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c index 7c8244d6a8..eba32037f2 100644 --- a/ssl/t1_lib.c +++ b/ssl/t1_lib.c @@ -1252,8 +1252,8 @@ TICKET_RETURN tls_decrypt_ticket(SSL *s, const unsigned char *etick, } /* Attempt to decrypt session data */ /* Move p after IV to start of encrypted ticket, update length */ - p = etick + 16 + EVP_CIPHER_CTX_iv_length(ctx); - eticklen -= 16 + EVP_CIPHER_CTX_iv_length(ctx); + p = etick + TLSEXT_KEYNAME_LENGTH + EVP_CIPHER_CTX_iv_length(ctx); + eticklen -= TLSEXT_KEYNAME_LENGTH + EVP_CIPHER_CTX_iv_length(ctx); sdec = OPENSSL_malloc(eticklen); if (sdec == NULL || EVP_DecryptUpdate(ctx, sdec, &slen, p, (int)eticklen) <= 0) { |