diff options
Diffstat (limited to 'src/lib/libssl/t1_lib.c')
-rw-r--r-- | src/lib/libssl/t1_lib.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index b2d9883900..0dbd83fecf 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: t1_lib.c,v 1.101 2017/01/23 04:55:27 beck Exp $ */ | 1 | /* $OpenBSD: t1_lib.c,v 1.102 2017/01/23 05:13:02 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -2206,12 +2206,13 @@ tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen, | |||
2206 | renew_ticket = 1; | 2206 | renew_ticket = 1; |
2207 | } else { | 2207 | } else { |
2208 | /* Check key name matches */ | 2208 | /* Check key name matches */ |
2209 | if (timingsafe_memcmp(etick, tctx->tlsext_tick_key_name, 16)) | 2209 | if (timingsafe_memcmp(etick, |
2210 | tctx->internal->tlsext_tick_key_name, 16)) | ||
2210 | return 2; | 2211 | return 2; |
2211 | HMAC_Init_ex(&hctx, tctx->tlsext_tick_hmac_key, 16, | 2212 | HMAC_Init_ex(&hctx, tctx->internal->tlsext_tick_hmac_key, |
2212 | tlsext_tick_md(), NULL); | 2213 | 16, tlsext_tick_md(), NULL); |
2213 | EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, | 2214 | EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, |
2214 | tctx->tlsext_tick_aes_key, etick + 16); | 2215 | tctx->internal->tlsext_tick_aes_key, etick + 16); |
2215 | } | 2216 | } |
2216 | 2217 | ||
2217 | /* | 2218 | /* |