summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_srvr.c
diff options
context:
space:
mode:
authorjsing <>2019-04-22 14:49:42 +0000
committerjsing <>2019-04-22 14:49:42 +0000
commit6b84d880719e36db21e824f5474abd9536466ccb (patch)
tree63b0ea25d0746842832bbfbb818b6338df9733d6 /src/lib/libssl/ssl_srvr.c
parent6cb76fe84ed5d0dde673a8aea04318d4dbcc96d9 (diff)
downloadopenbsd-6b84d880719e36db21e824f5474abd9536466ccb.tar.gz
openbsd-6b84d880719e36db21e824f5474abd9536466ccb.tar.bz2
openbsd-6b84d880719e36db21e824f5474abd9536466ccb.zip
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@
Diffstat (limited to 'src/lib/libssl/ssl_srvr.c')
-rw-r--r--src/lib/libssl/ssl_srvr.c4
1 files changed, 2 insertions, 2 deletions
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 @@
1/* $OpenBSD: ssl_srvr.c,v 1.66 2019/03/25 17:21:18 jsing Exp $ */ 1/* $OpenBSD: ssl_srvr.c,v 1.67 2019/04/22 14:49:42 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 *
@@ -2553,7 +2553,7 @@ ssl3_send_newsession_ticket(SSL *s)
2553 EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, 2553 EVP_EncryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL,
2554 tctx->internal->tlsext_tick_aes_key, iv); 2554 tctx->internal->tlsext_tick_aes_key, iv);
2555 HMAC_Init_ex(&hctx, tctx->internal->tlsext_tick_hmac_key, 2555 HMAC_Init_ex(&hctx, tctx->internal->tlsext_tick_hmac_key,
2556 16, tlsext_tick_md(), NULL); 2556 16, EVP_sha256(), NULL);
2557 memcpy(key_name, tctx->internal->tlsext_tick_key_name, 16); 2557 memcpy(key_name, tctx->internal->tlsext_tick_key_name, 16);
2558 } 2558 }
2559 2559