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/ssl_locl.h | |
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 'src/lib/libssl/ssl_locl.h')
-rw-r--r-- | src/lib/libssl/ssl_locl.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h index 31f3e60893..b895de1fd3 100644 --- a/src/lib/libssl/ssl_locl.h +++ b/src/lib/libssl/ssl_locl.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssl_locl.h,v 1.245 2019/04/04 16:44:24 jsing Exp $ */ | 1 | /* $OpenBSD: ssl_locl.h,v 1.246 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 | * |
@@ -1327,7 +1327,6 @@ int ssl_check_clienthello_tlsext_early(SSL *s); | |||
1327 | int ssl_check_clienthello_tlsext_late(SSL *s); | 1327 | int ssl_check_clienthello_tlsext_late(SSL *s); |
1328 | int ssl_check_serverhello_tlsext(SSL *s); | 1328 | int ssl_check_serverhello_tlsext(SSL *s); |
1329 | 1329 | ||
1330 | #define tlsext_tick_md EVP_sha256 | ||
1331 | int tls1_process_ticket(SSL *s, const unsigned char *session_id, | 1330 | int tls1_process_ticket(SSL *s, const unsigned char *session_id, |
1332 | int session_id_len, CBS *ext_block, SSL_SESSION **ret); | 1331 | int session_id_len, CBS *ext_block, SSL_SESSION **ret); |
1333 | 1332 | ||