From 934ce6f6a9a0420d8b434f7cc8299cf9a3c6731f Mon Sep 17 00:00:00 2001 From: Xiaokang Qian Date: Mon, 6 Feb 2023 10:23:04 +0000 Subject: [PATCH] Rename the finalize_client{server}_hello() Signed-off-by: Xiaokang Qian --- library/ssl_client.c | 4 ++-- library/ssl_misc.h | 2 +- library/ssl_tls13_client.c | 2 +- library/ssl_tls13_server.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/library/ssl_client.c b/library/ssl_client.c index 7ec43f5fc..963f8bb7c 100644 --- a/library/ssl_client.c +++ b/library/ssl_client.c @@ -964,14 +964,14 @@ int mbedtls_ssl_write_client_hello(mbedtls_ssl_context *ssl) /* * Set next state. Note that if TLS 1.3 is proposed, this may be - * overwritten by mbedtls_ssl_tls13_finalize_write_client_hello(). + * overwritten by mbedtls_ssl_tls13_finalize_client_hello(). */ mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_SERVER_HELLO); #if defined(MBEDTLS_SSL_PROTO_TLS1_3) if (ssl->handshake->min_tls_version <= MBEDTLS_SSL_VERSION_TLS1_3 && MBEDTLS_SSL_VERSION_TLS1_3 <= ssl->tls_version) { - ret = mbedtls_ssl_tls13_finalize_write_client_hello(ssl); + ret = mbedtls_ssl_tls13_finalize_client_hello(ssl); } #endif } diff --git a/library/ssl_misc.h b/library/ssl_misc.h index 29a60ec9a..ef05dcae6 100644 --- a/library/ssl_misc.h +++ b/library/ssl_misc.h @@ -2741,7 +2741,7 @@ static inline void mbedtls_ssl_session_clear_ticket_flags( #endif /* MBEDTLS_SSL_PROTO_TLS1_3 && MBEDTLS_SSL_SESSION_TICKETS */ #if defined(MBEDTLS_SSL_CLI_C) && defined(MBEDTLS_SSL_PROTO_TLS1_3) -int mbedtls_ssl_tls13_finalize_write_client_hello(mbedtls_ssl_context *ssl); +int mbedtls_ssl_tls13_finalize_client_hello(mbedtls_ssl_context *ssl); #endif #endif /* ssl_misc.h */ diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c index 623849940..8970dd429 100644 --- a/library/ssl_tls13_client.c +++ b/library/ssl_tls13_client.c @@ -1231,7 +1231,7 @@ int mbedtls_ssl_tls13_write_client_hello_exts(mbedtls_ssl_context *ssl, return 0; } -int mbedtls_ssl_tls13_finalize_write_client_hello(mbedtls_ssl_context *ssl) +int mbedtls_ssl_tls13_finalize_client_hello(mbedtls_ssl_context *ssl) { ((void) ssl); diff --git a/library/ssl_tls13_server.c b/library/ssl_tls13_server.c index ef90f69a2..81c289aee 100644 --- a/library/ssl_tls13_server.c +++ b/library/ssl_tls13_server.c @@ -2100,7 +2100,7 @@ static int ssl_tls13_write_server_hello_body(mbedtls_ssl_context *ssl, } MBEDTLS_CHECK_RETURN_CRITICAL -static int ssl_tls13_finalize_write_server_hello(mbedtls_ssl_context *ssl) +static int ssl_tls13_finalize_server_hello(mbedtls_ssl_context *ssl) { int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; ret = mbedtls_ssl_tls13_compute_handshake_transform(ssl); @@ -2140,7 +2140,7 @@ static int ssl_tls13_write_server_hello(mbedtls_ssl_context *ssl) MBEDTLS_SSL_PROC_CHK(mbedtls_ssl_finish_handshake_msg( ssl, buf_len, msg_len)); - MBEDTLS_SSL_PROC_CHK(ssl_tls13_finalize_write_server_hello(ssl)); + MBEDTLS_SSL_PROC_CHK(ssl_tls13_finalize_server_hello(ssl)); #if defined(MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE) /* The server sends a dummy change_cipher_spec record immediately