From 8df455479f8801bbebad8839fc96abbffa711603 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 14 May 2020 00:05:04 +0200 Subject: source cleanup: remove all custom typedef structs - Stick to a single unified way to use structs - Make checksrc complain on 'typedef struct {' - Allow them in tests, public headers and examples - Let MD4_CTX, MD5_CTX, and SHA256_CTX typedefs remain as they actually typedef different types/structs depending on build conditions. Closes #5338 --- lib/vtls/openssl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/vtls/openssl.c') diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c index a147e9980..5876d196f 100644 --- a/lib/vtls/openssl.c +++ b/lib/vtls/openssl.c @@ -215,11 +215,11 @@ #define ENABLE_SSLKEYLOGFILE #ifdef ENABLE_SSLKEYLOGFILE -typedef struct ssl_tap_state { +struct ssl_tap_state { int master_key_length; unsigned char master_key[SSL_MAX_MASTER_KEY_LENGTH]; unsigned char client_random[SSL3_RANDOM_SIZE]; -} ssl_tap_state_t; +}; #endif /* ENABLE_SSLKEYLOGFILE */ struct ssl_backend_data { @@ -229,7 +229,7 @@ struct ssl_backend_data { X509* server_cert; #ifdef ENABLE_SSLKEYLOGFILE /* tap_state holds the last seen master key if we're logging them */ - ssl_tap_state_t tap_state; + struct ssl_tap_state tap_state; #endif }; @@ -280,7 +280,7 @@ static void ossl_keylog_callback(const SSL *ssl, const char *line) * tap_ssl_key is called by libcurl to make the CLIENT_RANDOMs if the OpenSSL * being used doesn't have native support for doing that. */ -static void tap_ssl_key(const SSL *ssl, ssl_tap_state_t *state) +static void tap_ssl_key(const SSL *ssl, struct ssl_tap_state *state) { const char *hex = "0123456789ABCDEF"; int pos, i; -- cgit v1.2.3