From af2c0c8dd6d59e48fdfce962c2b23d6759c05a5a Mon Sep 17 00:00:00 2001 From: Jerry Yu Date: Tue, 12 Jul 2022 05:47:21 +0000 Subject: [PATCH] fix various comment/format issues Signed-off-by: Jerry Yu --- include/mbedtls/mbedtls_config.h | 2 +- library/ssl_tls13_client.c | 17 +++++++---------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/include/mbedtls/mbedtls_config.h b/include/mbedtls/mbedtls_config.h index 37793a791..ed673e7d7 100644 --- a/include/mbedtls/mbedtls_config.h +++ b/include/mbedtls/mbedtls_config.h @@ -1546,7 +1546,7 @@ * * Size in bytes of a ticket nonce. This is not used in TLS 1.2. * - * The default value is 32 bytes. + * This must be smaller or equal to 255. */ #define MBEDTLS_SSL_TICKET_NONCE_LENGTH 32 diff --git a/library/ssl_tls13_client.c b/library/ssl_tls13_client.c index 42653a310..b61626d07 100644 --- a/library/ssl_tls13_client.c +++ b/library/ssl_tls13_client.c @@ -1878,12 +1878,11 @@ static int ssl_tls13_handshake_wrapup( mbedtls_ssl_context *ssl ) #if defined(MBEDTLS_SSL_SESSION_TICKETS) -static int ssl_tls13_parse_new_session_ticket_extensions( - mbedtls_ssl_context *ssl, - const unsigned char *buf, - const unsigned char *end ) +static int ssl_tls13_parse_new_session_ticket_exts( mbedtls_ssl_context *ssl, + const unsigned char *buf, + const unsigned char *end ) { - unsigned char *p = ( unsigned char * )buf; + const unsigned char *p = buf; ((void) ssl); @@ -1891,22 +1890,20 @@ static int ssl_tls13_parse_new_session_ticket_extensions( { unsigned int extension_type; size_t extension_data_len; - const unsigned char *extension_data_end; - ((void) extension_data_end); MBEDTLS_SSL_CHK_BUF_READ_PTR( p, end, 4 ); extension_type = MBEDTLS_GET_UINT16_BE( p, 0 ); extension_data_len = MBEDTLS_GET_UINT16_BE( p, 2 ); p += 4; MBEDTLS_SSL_CHK_BUF_READ_PTR( p, end, extension_data_len ); - extension_data_end = p + extension_data_len; switch( extension_type ) { case MBEDTLS_TLS_EXT_EARLY_DATA: MBEDTLS_SSL_DEBUG_MSG( 4, ( "early_data extension received" ) ); break; + default: break; } @@ -2001,11 +1998,11 @@ static int ssl_tls13_parse_new_session_ticket( mbedtls_ssl_context *ssl, MBEDTLS_SSL_DEBUG_BUF( 3, "ticket->extension", p, extensions_len ); - ret = ssl_tls13_parse_new_session_ticket_extensions( ssl, p, end ); + ret = ssl_tls13_parse_new_session_ticket_exts( ssl, p, end ); if( ret != 0 ) { MBEDTLS_SSL_DEBUG_RET( 1, - "ssl_tls13_parse_new_session_ticket_extensions", + "ssl_tls13_parse_new_session_ticket_exts", ret ); return( ret ); }