summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_locl.h
diff options
context:
space:
mode:
authorjsing <>2021-02-07 15:26:32 +0000
committerjsing <>2021-02-07 15:26:32 +0000
commitadf5489ea8db2ed3bf4f2a1ddecfa1c6c7d1ebe2 (patch)
treeea023a4f428381ff72f5edc2aec4d7c062671aff /src/lib/libssl/ssl_locl.h
parent77acd5ef6aa31c8a997bc2aeb3ed612e5667eb39 (diff)
downloadopenbsd-adf5489ea8db2ed3bf4f2a1ddecfa1c6c7d1ebe2.tar.gz
openbsd-adf5489ea8db2ed3bf4f2a1ddecfa1c6c7d1ebe2.tar.bz2
openbsd-adf5489ea8db2ed3bf4f2a1ddecfa1c6c7d1ebe2.zip
Absorb ssl3_get_algorithm2() into ssl_get_handshake_evp_md().
The mess that is ssl_get_algorithm2() only exists to upgrade the handshake MAC of a pre-TLSv1.2 cipher suite to SHA256 when used with TLSv1.2. We can readily do this in ssl_get_handshake_evp_md(), which is far more readable. ok tb@
Diffstat (limited to 'src/lib/libssl/ssl_locl.h')
-rw-r--r--src/lib/libssl/ssl_locl.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index b56a99bb79..edb8223fe2 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.319 2021/02/07 15:04:10 jsing Exp $ */ 1/* $OpenBSD: ssl_locl.h,v 1.320 2021/02/07 15:26:32 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 *
@@ -1383,8 +1383,6 @@ int ssl_check_serverhello_tlsext(SSL *s);
1383 1383
1384int tls1_process_ticket(SSL *s, CBS *ext_block, int *alert, SSL_SESSION **ret); 1384int tls1_process_ticket(SSL *s, CBS *ext_block, int *alert, SSL_SESSION **ret);
1385 1385
1386long ssl_get_algorithm2(SSL *s);
1387
1388int tls1_check_ec_server_key(SSL *s); 1386int tls1_check_ec_server_key(SSL *s);
1389 1387
1390/* s3_cbc.c */ 1388/* s3_cbc.c */