From ecc2948f211627acb21d4d9b7b003543f84f0692 Mon Sep 17 00:00:00 2001 From: Xiaokang Qian Date: Wed, 2 Nov 2022 07:52:47 +0000 Subject: [PATCH] Fix format issues Signed-off-by: Xiaokang Qian --- include/mbedtls/ssl.h | 1 - library/ssl_misc.h | 7 ++++--- library/ssl_tls13_client.c | 8 +++----- library/ssl_tls13_generic.c | 5 ++--- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h index 92ab1a3902..f1d16bc603 100644 --- a/include/mbedtls/ssl.h +++ b/include/mbedtls/ssl.h @@ -1949,7 +1949,6 @@ void mbedtls_ssl_conf_authmode( mbedtls_ssl_config *conf, int authmode ); */ void mbedtls_ssl_tls13_conf_early_data( mbedtls_ssl_config *conf, int early_data_enabled ); - #endif /* MBEDTLS_SSL_PROTO_TLS1_3 && MBEDTLS_SSL_EARLY_DATA */ #if defined(MBEDTLS_X509_CRT_PARSE_C) diff --git a/library/ssl_misc.h b/library/ssl_misc.h index d454ebb518..581e1534c8 100644 --- a/library/ssl_misc.h +++ b/library/ssl_misc.h @@ -2058,9 +2058,10 @@ int mbedtls_ssl_tls13_generate_and_write_ecdh_key_exchange( #endif /* MBEDTLS_ECDH_C */ #if defined(MBEDTLS_SSL_EARLY_DATA) -int mbedtls_ssl_tls13_write_early_data_ext( - mbedtls_ssl_context *ssl, - unsigned char *buf, const unsigned char *end, size_t *olen); +int mbedtls_ssl_tls13_write_early_data_ext( mbedtls_ssl_context *ssl, + unsigned char *buf, + const unsigned char *end, + size_t *out_len ); #endif /* MBEDTLS_SSL_EARLY_DATA */ #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */ diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c index 8879c44af0..c019db2fad 100644 --- a/library/ssl_tls13_client.c +++ b/library/ssl_tls13_client.c @@ -693,7 +693,6 @@ static psa_algorithm_t ssl_tls13_get_ciphersuite_hash_alg( int ciphersuite ) } #if defined(MBEDTLS_SSL_SESSION_TICKETS) -MBEDTLS_CHECK_RETURN_CRITICAL static int ssl_tls13_has_configured_ticket( mbedtls_ssl_context *ssl ) { mbedtls_ssl_session *session = ssl->session_negotiate; @@ -1094,8 +1093,7 @@ static int ssl_tls13_parse_server_pre_shared_key_ext( mbedtls_ssl_context *ssl, } #if defined(MBEDTLS_SSL_SESSION_TICKETS) - if( selected_identity == 0 && - ssl_tls13_has_configured_ticket( ssl ) ) + if( selected_identity == 0 && ssl_tls13_has_configured_ticket( ssl ) ) { ret = ssl_tls13_ticket_get_psk( ssl, &hash_alg, &psk, &psk_len ); } @@ -1174,8 +1172,8 @@ int mbedtls_ssl_tls13_write_client_hello_exts( mbedtls_ssl_context *ssl, p += ext_len; ssl->handshake->early_data = MBEDTLS_SSL_EARLY_DATA_ON; - /* We're using rejected once we send the EarlyData extension, - and change it to accepted upon receipt of the server extension. */ + /* Initializes the status to `rejected`. Changes it to `accepted` + * when `early_data` is received in EncryptedExtesion. */ ssl->early_data_status = MBEDTLS_SSL_EARLY_DATA_STATUS_REJECTED; } else diff --git a/library/ssl_tls13_generic.c b/library/ssl_tls13_generic.c index a27315102d..04790387a6 100644 --- a/library/ssl_tls13_generic.c +++ b/library/ssl_tls13_generic.c @@ -1374,11 +1374,11 @@ cleanup: #endif /* MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE */ -/* Early Data Extension +/* Early Data Indication Extension * * struct { * select ( Handshake.msg_type ) { - * case new_session_ticket: uint32 max_early_data_size; + * ... * case client_hello: Empty; * case encrypted_extensions: Empty; * }; @@ -1399,7 +1399,6 @@ int mbedtls_ssl_tls13_write_early_data_ext( mbedtls_ssl_context *ssl, 3, ( "client hello, adding early_data extension" ) ); MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_EARLY_DATA, p, 0 ); - /* Write length of the early data indication extension */ MBEDTLS_PUT_UINT16_BE( 0, p, 2 ); *out_len = 4;