ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-05-10 00:49:04 +08:00
Code Issues Releases Wiki Activity

Fix format issues

Browse Source 
Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>
This commit is contained in:
Xiaokang Qian 2022-11-02 07:52:47 +00:00
parent 76332816c7
commit ecc2948f21
4 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/mbedtls/ssl.h
View File

@ -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, void mbedtls_ssl_tls13_conf_early_data( mbedtls_ssl_config *conf,
int early_data_enabled ); int early_data_enabled );
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 && MBEDTLS_SSL_EARLY_DATA */ #endif /* MBEDTLS_SSL_PROTO_TLS1_3 && MBEDTLS_SSL_EARLY_DATA */
#if defined(MBEDTLS_X509_CRT_PARSE_C) #if defined(MBEDTLS_X509_CRT_PARSE_C)

7
library/ssl_misc.h
View File

@ -2058,9 +2058,10 @@ int mbedtls_ssl_tls13_generate_and_write_ecdh_key_exchange(
#endif /* MBEDTLS_ECDH_C */ #endif /* MBEDTLS_ECDH_C */
#if defined(MBEDTLS_SSL_EARLY_DATA) #if defined(MBEDTLS_SSL_EARLY_DATA)
int mbedtls_ssl_tls13_write_early_data_ext( int mbedtls_ssl_tls13_write_early_data_ext( mbedtls_ssl_context *ssl,
mbedtls_ssl_context *ssl, unsigned char *buf,
unsigned char *buf, const unsigned char *end, size_t *olen); const unsigned char *end,
size_t *out_len );
#endif /* MBEDTLS_SSL_EARLY_DATA */ #endif /* MBEDTLS_SSL_EARLY_DATA */
#endif /* MBEDTLS_SSL_PROTO_TLS1_3 */ #endif /* MBEDTLS_SSL_PROTO_TLS1_3 */

8
library/ssl_tls13_client.c
View File

@ -693,7 +693,6 @@ static psa_algorithm_t ssl_tls13_get_ciphersuite_hash_alg( int ciphersuite )
} }
#if defined(MBEDTLS_SSL_SESSION_TICKETS) #if defined(MBEDTLS_SSL_SESSION_TICKETS)
MBEDTLS_CHECK_RETURN_CRITICAL
static int ssl_tls13_has_configured_ticket( mbedtls_ssl_context *ssl ) static int ssl_tls13_has_configured_ticket( mbedtls_ssl_context *ssl )
{ {
mbedtls_ssl_session *session = ssl->session_negotiate; 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 defined(MBEDTLS_SSL_SESSION_TICKETS)
if( selected_identity == 0 && if( selected_identity == 0 && ssl_tls13_has_configured_ticket( ssl ) )
ssl_tls13_has_configured_ticket( ssl ) )
{ {
ret = ssl_tls13_ticket_get_psk( ssl, &hash_alg, &psk, &psk_len ); 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; p += ext_len;
ssl->handshake->early_data = MBEDTLS_SSL_EARLY_DATA_ON; ssl->handshake->early_data = MBEDTLS_SSL_EARLY_DATA_ON;
/* We're using rejected once we send the EarlyData extension, /* Initializes the status to `rejected`. Changes it to `accepted`
and change it to accepted upon receipt of the server extension. */ * when `early_data` is received in EncryptedExtesion. */
ssl->early_data_status = MBEDTLS_SSL_EARLY_DATA_STATUS_REJECTED; ssl->early_data_status = MBEDTLS_SSL_EARLY_DATA_STATUS_REJECTED;
} }
else else

5
library/ssl_tls13_generic.c
View File

@ -1374,11 +1374,11 @@ cleanup:
#endif /* MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE */ #endif /* MBEDTLS_SSL_TLS1_3_COMPATIBILITY_MODE */
/* Early Data Extension /* Early Data Indication Extension
* *
* struct { * struct {
* select ( Handshake.msg_type ) { * select ( Handshake.msg_type ) {
* case new_session_ticket: uint32 max_early_data_size; * ...
* case client_hello: Empty; * case client_hello: Empty;
* case encrypted_extensions: 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" ) ); 3, ( "client hello, adding early_data extension" ) );
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_EARLY_DATA, p, 0 ); 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 ); MBEDTLS_PUT_UINT16_BE( 0, p, 2 );
*out_len = 4; *out_len = 4;