summaryrefslogtreecommitdiffstats
path: root/lib/libssl/t1_lib.c
diff options
context:
space:
mode:
authorguenther <guenther@openbsd.org>2020-10-11 12:45:51 +0000
committerguenther <guenther@openbsd.org>2020-10-11 12:45:51 +0000
commit1d2a9be251ec81a5f71561a049367a866b78909a (patch)
treef9cfc892f36ca991a8c9a84e295ecbcfe5a09a33 /lib/libssl/t1_lib.c
parentImplement more of RFC 8630 and support more than one URI in the TAL file. (diff)
downloadwireguard-openbsd-1d2a9be251ec81a5f71561a049367a866b78909a.tar.xz
wireguard-openbsd-1d2a9be251ec81a5f71561a049367a866b78909a.zip
SSL3_ENC_METHOD is just a flag word; merge it into SSL_METHOD_INTERNAL
with #defines for the per-version initializers instead of extern globals. Add SSL_USE_SHA256_PRF() to complete the abstraction. ok tb@ jsing@
Diffstat (limited to 'lib/libssl/t1_lib.c')
-rw-r--r--lib/libssl/t1_lib.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/lib/libssl/t1_lib.c b/lib/libssl/t1_lib.c
index 5635c8ff437..10ca80c4fe4 100644
--- a/lib/libssl/t1_lib.c
+++ b/lib/libssl/t1_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: t1_lib.c,v 1.177 2020/10/07 08:43:34 jsing Exp $ */
+/* $OpenBSD: t1_lib.c,v 1.178 2020/10/11 12:45:52 guenther Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -125,19 +125,6 @@
static int tls_decrypt_ticket(SSL *s, CBS *ticket, int *alert,
SSL_SESSION **psess);
-SSL3_ENC_METHOD TLSv1_enc_data = {
- .enc_flags = 0,
-};
-
-SSL3_ENC_METHOD TLSv1_1_enc_data = {
- .enc_flags = 0,
-};
-
-SSL3_ENC_METHOD TLSv1_2_enc_data = {
- .enc_flags = SSL_ENC_FLAG_SIGALGS|SSL_ENC_FLAG_SHA256_PRF|
- SSL_ENC_FLAG_TLS1_2_CIPHERS,
-};
-
int
tls1_new(SSL *s)
{