From 6b84d880719e36db21e824f5474abd9536466ccb Mon Sep 17 00:00:00 2001 From: jsing <> Date: Mon, 22 Apr 2019 14:49:42 +0000 Subject: Inline and remove the tlsext_tick_md macro. There is not much point having a tlsext_tick_md macro that replaces EVP_sha256() in two places, when the cipher is just hardcoded. ok tb@ --- src/lib/libssl/t1_lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/lib/libssl/t1_lib.c') diff --git a/src/lib/libssl/t1_lib.c b/src/lib/libssl/t1_lib.c index 75c936abc7..b8aa989413 100644 --- a/src/lib/libssl/t1_lib.c +++ b/src/lib/libssl/t1_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: t1_lib.c,v 1.157 2019/04/21 14:41:30 jsing Exp $ */ +/* $OpenBSD: t1_lib.c,v 1.158 2019/04/22 14:49:42 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -925,7 +925,7 @@ tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen, goto done; } HMAC_Init_ex(&hctx, tctx->internal->tlsext_tick_hmac_key, - 16, tlsext_tick_md(), NULL); + 16, EVP_sha256(), NULL); EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, tctx->internal->tlsext_tick_aes_key, etick + 16); } -- cgit v1.2.3-55-g6feb