diff options
| author |   guenther <guenther@openbsd.org> | 2020-10-11 12:45:51 +0000 |
|---|---|---|
| committer | guenther <guenther@openbsd.org> | 2020-10-11 12:45:51 +0000 |
| commit | 1d2a9be251ec81a5f71561a049367a866b78909a (patch) | |
| tree | f9cfc892f36ca991a8c9a84e295ecbcfe5a09a33 /lib/libssl/ssl_methods.c | |
| parent | Implement more of RFC 8630 and support more than one URI in the TAL file. (diff) | |
| download | wireguard-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/ssl_methods.c')
| -rw-r--r-- | lib/libssl/ssl_methods.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/libssl/ssl_methods.c b/lib/libssl/ssl_methods.c index 23c7e97b574..e2d5766e0f2 100644 --- a/lib/libssl/ssl_methods.c +++ b/lib/libssl/ssl_methods.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_methods.c,v 1.18 2020/10/11 02:22:27 jsing Exp $ */ +/* $OpenBSD: ssl_methods.c,v 1.19 2020/10/11 12:45:52 guenther Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -74,7 +74,7 @@ static const SSL_METHOD_INTERNAL DTLSv1_method_internal_data = { .ssl_pending = ssl3_pending, .ssl_read_bytes = dtls1_read_bytes, .ssl_write_bytes = dtls1_write_app_data_bytes, - .ssl3_enc = &TLSv1_1_enc_data, + .enc_flags = TLSV1_1_ENC_FLAGS, }; static const SSL_METHOD DTLSv1_method_data = { @@ -138,7 +138,7 @@ static const SSL_METHOD_INTERNAL TLS_method_internal_data = { .ssl_pending = tls13_legacy_pending, .ssl_read_bytes = tls13_legacy_read_bytes, .ssl_write_bytes = tls13_legacy_write_bytes, - .ssl3_enc = &TLSv1_3_enc_data, + .enc_flags = TLSV1_3_ENC_FLAGS, }; static const SSL_METHOD TLS_method_data = { @@ -166,7 +166,7 @@ static const SSL_METHOD_INTERNAL TLS_legacy_method_internal_data = { .ssl_pending = ssl3_pending, .ssl_read_bytes = ssl3_read_bytes, .ssl_write_bytes = ssl3_write_bytes, - .ssl3_enc = &TLSv1_2_enc_data, + .enc_flags = TLSV1_2_ENC_FLAGS, }; static const SSL_METHOD TLS_legacy_method_data = { @@ -193,7 +193,7 @@ static const SSL_METHOD_INTERNAL TLSv1_method_internal_data = { .ssl_pending = ssl3_pending, .ssl_read_bytes = ssl3_read_bytes, .ssl_write_bytes = ssl3_write_bytes, - .ssl3_enc = &TLSv1_enc_data, + .enc_flags = TLSV1_ENC_FLAGS, }; static const SSL_METHOD TLSv1_method_data = { @@ -220,7 +220,7 @@ static const SSL_METHOD_INTERNAL TLSv1_1_method_internal_data = { .ssl_pending = ssl3_pending, .ssl_read_bytes = ssl3_read_bytes, .ssl_write_bytes = ssl3_write_bytes, - .ssl3_enc = &TLSv1_1_enc_data, + .enc_flags = TLSV1_1_ENC_FLAGS, }; static const SSL_METHOD TLSv1_1_method_data = { @@ -247,7 +247,7 @@ static const SSL_METHOD_INTERNAL TLSv1_2_method_internal_data = { .ssl_pending = ssl3_pending, .ssl_read_bytes = ssl3_read_bytes, .ssl_write_bytes = ssl3_write_bytes, - .ssl3_enc = &TLSv1_2_enc_data, + .enc_flags = TLSV1_2_ENC_FLAGS, }; static const SSL_METHOD TLSv1_2_method_data = { |