eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename the finalize_client{server}_hello()

Browse source 
Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>
This commit is contained in:
Xiaokang Qian 2023-02-06 10:23:04 +00:00
parent ac4c625dea
commit 934ce6f6a9
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
library/ssl_client.c
View file

@ -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 * 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); mbedtls_ssl_handshake_set_state(ssl, MBEDTLS_SSL_SERVER_HELLO);
#if defined(MBEDTLS_SSL_PROTO_TLS1_3) #if defined(MBEDTLS_SSL_PROTO_TLS1_3)
if (ssl->handshake->min_tls_version <= MBEDTLS_SSL_VERSION_TLS1_3 && if (ssl->handshake->min_tls_version <= MBEDTLS_SSL_VERSION_TLS1_3 &&
MBEDTLS_SSL_VERSION_TLS1_3 <= ssl->tls_version) { 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 #endif
} }

2
library/ssl_misc.h
View file

@ -2741,7 +2741,7 @@ static inline void mbedtls_ssl_session_clear_ticket_flags(
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 && MBEDTLS_SSL_SESSION_TICKETS */ #endif /* MBEDTLS_SSL_PROTO_TLS1_3 && MBEDTLS_SSL_SESSION_TICKETS */
#if defined(MBEDTLS_SSL_CLI_C) && defined(MBEDTLS_SSL_PROTO_TLS1_3) #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
#endif /* ssl_misc.h */ #endif /* ssl_misc.h */

2
library/ssl_tls13_client.c
View file

@ -1231,7 +1231,7 @@ int mbedtls_ssl_tls13_write_client_hello_exts(mbedtls_ssl_context *ssl,
return 0; 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); ((void) ssl);

4
library/ssl_tls13_server.c
View file

@ -2100,7 +2100,7 @@ static int ssl_tls13_write_server_hello_body(mbedtls_ssl_context *ssl,
} }
MBEDTLS_CHECK_RETURN_CRITICAL 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; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
ret = mbedtls_ssl_tls13_compute_handshake_transform(ssl); 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( MBEDTLS_SSL_PROC_CHK(mbedtls_ssl_finish_handshake_msg(
ssl, buf_len, msg_len)); 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) #if defined(MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE)
/* The server sends a dummy change_cipher_spec record immediately /* The server sends a dummy change_cipher_spec record immediately