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/ssl_srvr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/libssl/ssl_srvr.c')

diff --git a/src/lib/libssl/ssl_srvr.c b/src/lib/libssl/ssl_srvr.c
index 745d0228f3..0a53343058 100644
--- a/src/lib/libssl/ssl_srvr.c
+++ b/src/lib/libssl/ssl_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_srvr.c,v 1.66 2019/03/25 17:21:18 jsing Exp $ */
+/* $OpenBSD: ssl_srvr.c,v 1.67 2019/04/22 14:49:42 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2553,7 +2553,7 @@ ssl3_send_newsession_ticket(SSL *s)
 			EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL,
 			    tctx->internal->tlsext_tick_aes_key, iv);
 			HMAC_Init_ex(&hctx, tctx->internal->tlsext_tick_hmac_key,
-			    16, tlsext_tick_md(), NULL);
+			    16, EVP_sha256(), NULL);
 			memcpy(key_name, tctx->internal->tlsext_tick_key_name, 16);
 		}
 
-- 
cgit v1.2.3-55-g6feb