From 141bbe7beeabad6b212f16a615b7f5d191586b3e Mon Sep 17 00:00:00 2001 From: Jerry Yu Date: Thu, 1 Dec 2022 20:30:41 +0800 Subject: [PATCH] tls13: Adjust include files - remove duplicate and unused included - Adjust the order to system, mbedtls global, local. Signed-off-by: Jerry Yu --- library/ssl_client.c | 6 +----- library/ssl_tls13_generic.c | 6 ++---- library/ssl_tls13_server.c | 10 ---------- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/library/ssl_client.c b/library/ssl_client.c index 2c4ce43161..b7de4bcec9 100644 --- a/library/ssl_client.c +++ b/library/ssl_client.c @@ -24,15 +24,11 @@ #if defined(MBEDTLS_SSL_CLI_C) #if defined(MBEDTLS_SSL_PROTO_TLS1_3) || defined(MBEDTLS_SSL_PROTO_TLS1_2) -#include "mbedtls/platform.h" - #include #include "mbedtls/debug.h" #include "mbedtls/error.h" -#if defined(MBEDTLS_HAVE_TIME) -#include "mbedtls/platform_time.h" -#endif +#include "mbedtls/platform.h" #include "ssl_client.h" #include "ssl_misc.h" diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c index 761c00ec52..0aecb35444 100644 --- a/library/ssl_tls13_generic.c +++ b/library/ssl_tls13_generic.c @@ -28,16 +28,14 @@ #include "mbedtls/oid.h" #include "mbedtls/platform.h" #include "mbedtls/constant_time.h" -#include +#include "psa/crypto.h" +#include "mbedtls/psa_util.h" #include "ssl_misc.h" #include "ssl_tls13_invasive.h" #include "ssl_tls13_keys.h" #include "ssl_debug_helpers.h" -#include "psa/crypto.h" -#include "mbedtls/psa_util.h" - const uint8_t mbedtls_ssl_tls13_hello_retry_request_magic[ MBEDTLS_SERVER_HELLO_RANDOM_LEN ] = { 0xCF, 0x21, 0xAD, 0x74, 0xE5, 0x9A, 0x61, 0x11, diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c index 6caae89b48..685e10ba15 100644 --- a/library/ssl_tls13_server.c +++ b/library/ssl_tls13_server.c @@ -30,16 +30,6 @@ #include "ssl_tls13_keys.h" #include "ssl_debug_helpers.h" -#if defined(MBEDTLS_ECP_C) -#include "mbedtls/ecp.h" -#endif /* MBEDTLS_ECP_C */ - -#include "mbedtls/platform.h" - -#include "ssl_misc.h" -#include "ssl_tls13_keys.h" -#include "ssl_debug_helpers.h" - static const mbedtls_ssl_ciphersuite_t *ssl_tls13_validate_peer_ciphersuite( mbedtls_ssl_context *ssl,