diff options
author | jsing <> | 2019-04-22 14:49:42 +0000 |
---|---|---|
committer | jsing <> | 2019-04-22 14:49:42 +0000 |
commit | 6b84d880719e36db21e824f5474abd9536466ccb (patch) | |
tree | 63b0ea25d0746842832bbfbb818b6338df9733d6 /src/lib/libssl/t1_lib.c | |
parent | 6cb76fe84ed5d0dde673a8aea04318d4dbcc96d9 (diff) | |
download | openbsd-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 '')
-rw-r--r-- | src/lib/libssl/t1_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
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 @@ | |||
1 | /* $OpenBSD: t1_lib.c,v 1.157 2019/04/21 14:41:30 jsing Exp $ */ | 1 | /* $OpenBSD: t1_lib.c,v 1.158 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 | * |
@@ -925,7 +925,7 @@ tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen, | |||
925 | goto done; | 925 | goto done; |
926 | } | 926 | } |
927 | HMAC_Init_ex(&hctx, tctx->internal->tlsext_tick_hmac_key, | 927 | HMAC_Init_ex(&hctx, tctx->internal->tlsext_tick_hmac_key, |
928 | 16, tlsext_tick_md(), NULL); | 928 | 16, EVP_sha256(), NULL); |
929 | EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, | 929 | EVP_DecryptInit_ex(&ctx, EVP_aes_128_cbc(), NULL, |
930 | tctx->internal->tlsext_tick_aes_key, etick + 16); | 930 | tctx->internal->tlsext_tick_aes_key, etick + 16); |
931 | } | 931 | } |