From a0afc1b4032278e02db285a67fa2e295e9970176 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Thu, 1 Jul 2021 17:53:39 +0000 Subject: Merge SSL_METHOD_INTERNAL into SSL_METHOD. Now that SSL_METHOD is opaque and in internal headers, we can remove SSL_METHOD_INTERNAL by merging it back into SSL_METHOD. ok tb@ --- src/lib/libssl/ssl_methods.c | 130 +++++++++++-------------------------------- 1 file changed, 33 insertions(+), 97 deletions(-) (limited to 'src/lib/libssl/ssl_methods.c') diff --git a/src/lib/libssl/ssl_methods.c b/src/lib/libssl/ssl_methods.c index f1a59cd738..a3097c37b9 100644 --- a/src/lib/libssl/ssl_methods.c +++ b/src/lib/libssl/ssl_methods.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_methods.c,v 1.25 2021/05/16 13:56:31 jsing Exp $ */ +/* $OpenBSD: ssl_methods.c,v 1.26 2021/07/01 17:53:39 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -60,7 +60,7 @@ #include "ssl_locl.h" #include "tls13_internal.h" -static const SSL_METHOD_INTERNAL DTLS_method_internal_data = { +static const SSL_METHOD DTLS_method_data = { .dtls = 1, .server = 1, .version = DTLS1_2_VERSION, @@ -77,19 +77,15 @@ static const SSL_METHOD_INTERNAL DTLS_method_internal_data = { .ssl_pending = ssl3_pending, .ssl_read_bytes = dtls1_read_bytes, .ssl_write_bytes = dtls1_write_app_data_bytes, - .enc_flags = TLSV1_2_ENC_FLAGS, -}; - -static const SSL_METHOD DTLS_method_data = { .ssl_dispatch_alert = dtls1_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = dtls1_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &DTLS_method_internal_data, + .enc_flags = TLSV1_2_ENC_FLAGS, }; -static const SSL_METHOD_INTERNAL DTLS_client_method_internal_data = { +static const SSL_METHOD DTLS_client_method_data = { .dtls = 1, .server = 0, .version = DTLS1_2_VERSION, @@ -106,19 +102,15 @@ static const SSL_METHOD_INTERNAL DTLS_client_method_internal_data = { .ssl_pending = ssl3_pending, .ssl_read_bytes = dtls1_read_bytes, .ssl_write_bytes = dtls1_write_app_data_bytes, - .enc_flags = TLSV1_2_ENC_FLAGS, -}; - -static const SSL_METHOD DTLS_client_method_data = { .ssl_dispatch_alert = dtls1_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = dtls1_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &DTLS_client_method_internal_data, + .enc_flags = TLSV1_2_ENC_FLAGS, }; -static const SSL_METHOD_INTERNAL DTLSv1_method_internal_data = { +static const SSL_METHOD DTLSv1_method_data = { .dtls = 1, .server = 1, .version = DTLS1_VERSION, @@ -135,19 +127,15 @@ 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, - .enc_flags = TLSV1_1_ENC_FLAGS, -}; - -static const SSL_METHOD DTLSv1_method_data = { .ssl_dispatch_alert = dtls1_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = dtls1_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &DTLSv1_method_internal_data, + .enc_flags = TLSV1_1_ENC_FLAGS, }; -static const SSL_METHOD_INTERNAL DTLSv1_client_method_internal_data = { +static const SSL_METHOD DTLSv1_client_method_data = { .dtls = 1, .server = 0, .version = DTLS1_VERSION, @@ -164,19 +152,15 @@ static const SSL_METHOD_INTERNAL DTLSv1_client_method_internal_data = { .ssl_pending = ssl3_pending, .ssl_read_bytes = dtls1_read_bytes, .ssl_write_bytes = dtls1_write_app_data_bytes, - .enc_flags = TLSV1_1_ENC_FLAGS, -}; - -static const SSL_METHOD DTLSv1_client_method_data = { .ssl_dispatch_alert = dtls1_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = dtls1_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &DTLSv1_client_method_internal_data, + .enc_flags = TLSV1_1_ENC_FLAGS, }; -static const SSL_METHOD_INTERNAL DTLSv1_2_method_internal_data = { +static const SSL_METHOD DTLSv1_2_method_data = { .dtls = 1, .server = 1, .version = DTLS1_2_VERSION, @@ -193,19 +177,15 @@ static const SSL_METHOD_INTERNAL DTLSv1_2_method_internal_data = { .ssl_pending = ssl3_pending, .ssl_read_bytes = dtls1_read_bytes, .ssl_write_bytes = dtls1_write_app_data_bytes, - .enc_flags = TLSV1_2_ENC_FLAGS, -}; - -static const SSL_METHOD DTLSv1_2_method_data = { .ssl_dispatch_alert = dtls1_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = dtls1_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &DTLSv1_2_method_internal_data, + .enc_flags = TLSV1_2_ENC_FLAGS, }; -static const SSL_METHOD_INTERNAL DTLSv1_2_client_method_internal_data = { +static const SSL_METHOD DTLSv1_2_client_method_data = { .dtls = 1, .server = 0, .version = DTLS1_2_VERSION, @@ -222,16 +202,12 @@ static const SSL_METHOD_INTERNAL DTLSv1_2_client_method_internal_data = { .ssl_pending = ssl3_pending, .ssl_read_bytes = dtls1_read_bytes, .ssl_write_bytes = dtls1_write_app_data_bytes, - .enc_flags = TLSV1_2_ENC_FLAGS, -}; - -static const SSL_METHOD DTLSv1_2_client_method_data = { .ssl_dispatch_alert = dtls1_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = dtls1_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &DTLSv1_2_client_method_internal_data, + .enc_flags = TLSV1_2_ENC_FLAGS, }; const SSL_METHOD * @@ -289,7 +265,7 @@ DTLS_server_method(void) } #if defined(LIBRESSL_HAS_TLS1_3_CLIENT) && defined(LIBRESSL_HAS_TLS1_3_SERVER) -static const SSL_METHOD_INTERNAL TLS_method_internal_data = { +static const SSL_METHOD TLS_method_data = { .dtls = 0, .server = 1, .version = TLS1_3_VERSION, @@ -306,20 +282,16 @@ 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, - .enc_flags = TLSV1_3_ENC_FLAGS, -}; - -static const SSL_METHOD TLS_method_data = { .ssl_dispatch_alert = ssl3_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &TLS_method_internal_data, + .enc_flags = TLSV1_3_ENC_FLAGS, }; #endif -static const SSL_METHOD_INTERNAL TLS_legacy_method_internal_data = { +static const SSL_METHOD TLS_legacy_method_data = { .dtls = 0, .server = 1, .version = TLS1_2_VERSION, @@ -336,20 +308,16 @@ 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, - .enc_flags = TLSV1_2_ENC_FLAGS, -}; - -static const SSL_METHOD TLS_legacy_method_data = { .ssl_dispatch_alert = ssl3_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &TLS_legacy_method_internal_data, + .enc_flags = TLSV1_2_ENC_FLAGS, }; #if defined(LIBRESSL_HAS_TLS1_3_CLIENT) -static const SSL_METHOD_INTERNAL TLS_client_method_internal_data = { +static const SSL_METHOD TLS_client_method_data = { .dtls = 0, .server = 0, .version = TLS1_3_VERSION, @@ -366,21 +334,17 @@ static const SSL_METHOD_INTERNAL TLS_client_method_internal_data = { .ssl_pending = tls13_legacy_pending, .ssl_read_bytes = tls13_legacy_read_bytes, .ssl_write_bytes = tls13_legacy_write_bytes, - .enc_flags = TLSV1_3_ENC_FLAGS, -}; - -static const SSL_METHOD TLS_client_method_data = { .ssl_dispatch_alert = ssl3_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &TLS_client_method_internal_data, + .enc_flags = TLSV1_3_ENC_FLAGS, }; #else -static const SSL_METHOD_INTERNAL TLS_legacy_client_method_internal_data = { +static const SSL_METHOD TLS_legacy_client_method_data = { .dtls = 0, .server = 0, .version = TLS1_2_VERSION, @@ -397,20 +361,16 @@ static const SSL_METHOD_INTERNAL TLS_legacy_client_method_internal_data = { .ssl_pending = ssl3_pending, .ssl_read_bytes = ssl3_read_bytes, .ssl_write_bytes = ssl3_write_bytes, - .enc_flags = TLSV1_2_ENC_FLAGS, -}; - -static const SSL_METHOD TLS_legacy_client_method_data = { .ssl_dispatch_alert = ssl3_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &TLS_legacy_client_method_internal_data, + .enc_flags = TLSV1_2_ENC_FLAGS, }; #endif -static const SSL_METHOD_INTERNAL TLSv1_method_internal_data = { +static const SSL_METHOD TLSv1_method_data = { .dtls = 0, .server = 1, .version = TLS1_VERSION, @@ -427,19 +387,15 @@ 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, - .enc_flags = TLSV1_ENC_FLAGS, -}; - -static const SSL_METHOD TLSv1_method_data = { .ssl_dispatch_alert = ssl3_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &TLSv1_method_internal_data, + .enc_flags = TLSV1_ENC_FLAGS, }; -static const SSL_METHOD_INTERNAL TLSv1_client_method_internal_data = { +static const SSL_METHOD TLSv1_client_method_data = { .dtls = 0, .server = 0, .version = TLS1_VERSION, @@ -456,19 +412,15 @@ static const SSL_METHOD_INTERNAL TLSv1_client_method_internal_data = { .ssl_pending = ssl3_pending, .ssl_read_bytes = ssl3_read_bytes, .ssl_write_bytes = ssl3_write_bytes, - .enc_flags = TLSV1_ENC_FLAGS, -}; - -static const SSL_METHOD TLSv1_client_method_data = { .ssl_dispatch_alert = ssl3_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &TLSv1_client_method_internal_data, + .enc_flags = TLSV1_ENC_FLAGS, }; -static const SSL_METHOD_INTERNAL TLSv1_1_method_internal_data = { +static const SSL_METHOD TLSv1_1_method_data = { .dtls = 0, .server = 1, .version = TLS1_1_VERSION, @@ -485,19 +437,15 @@ 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, - .enc_flags = TLSV1_1_ENC_FLAGS, -}; - -static const SSL_METHOD TLSv1_1_method_data = { .ssl_dispatch_alert = ssl3_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &TLSv1_1_method_internal_data, + .enc_flags = TLSV1_1_ENC_FLAGS, }; -static const SSL_METHOD_INTERNAL TLSv1_1_client_method_internal_data = { +static const SSL_METHOD TLSv1_1_client_method_data = { .dtls = 0, .server = 0, .version = TLS1_1_VERSION, @@ -514,19 +462,15 @@ static const SSL_METHOD_INTERNAL TLSv1_1_client_method_internal_data = { .ssl_pending = ssl3_pending, .ssl_read_bytes = ssl3_read_bytes, .ssl_write_bytes = ssl3_write_bytes, - .enc_flags = TLSV1_1_ENC_FLAGS, -}; - -static const SSL_METHOD TLSv1_1_client_method_data = { .ssl_dispatch_alert = ssl3_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &TLSv1_1_client_method_internal_data, + .enc_flags = TLSV1_1_ENC_FLAGS, }; -static const SSL_METHOD_INTERNAL TLSv1_2_method_internal_data = { +static const SSL_METHOD TLSv1_2_method_data = { .dtls = 0, .server = 1, .version = TLS1_2_VERSION, @@ -543,19 +487,15 @@ 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, - .enc_flags = TLSV1_2_ENC_FLAGS, -}; - -static const SSL_METHOD TLSv1_2_method_data = { .ssl_dispatch_alert = ssl3_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &TLSv1_2_method_internal_data, + .enc_flags = TLSV1_2_ENC_FLAGS, }; -static const SSL_METHOD_INTERNAL TLSv1_2_client_method_internal_data = { +static const SSL_METHOD TLSv1_2_client_method_data = { .dtls = 0, .server = 0, .version = TLS1_2_VERSION, @@ -572,16 +512,12 @@ static const SSL_METHOD_INTERNAL TLSv1_2_client_method_internal_data = { .ssl_pending = ssl3_pending, .ssl_read_bytes = ssl3_read_bytes, .ssl_write_bytes = ssl3_write_bytes, - .enc_flags = TLSV1_2_ENC_FLAGS, -}; - -static const SSL_METHOD TLSv1_2_client_method_data = { .ssl_dispatch_alert = ssl3_dispatch_alert, .num_ciphers = ssl3_num_ciphers, .get_cipher = ssl3_get_cipher, .get_cipher_by_char = ssl3_get_cipher_by_char, .put_cipher_by_char = ssl3_put_cipher_by_char, - .internal = &TLSv1_2_client_method_internal_data, + .enc_flags = TLSV1_2_ENC_FLAGS, }; const SSL_METHOD * -- cgit v1.2.3-55-g6feb