mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-03 19:20:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix comment issues

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2021-09-02 12:59:12 +08:00
parent 790656a0a6
commit 0c63af6ed6
2 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
library/ssl_tls13_client.c
View File

@ -54,7 +54,7 @@ static int ssl_tls13_write_supported_versions_ext( mbedtls_ssl_context *ssl,
MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding supported versions extension" ) ); MBEDTLS_SSL_DEBUG_MSG( 3, ( "client hello, adding supported versions extension" ) );
/* /*
* Reserve space for extension header. * Check space for extension header.
* *
* extension_type 2 * extension_type 2
* extension_data_length 2 * extension_data_length 2
@ -73,12 +73,11 @@ static int ssl_tls13_write_supported_versions_ext( mbedtls_ssl_context *ssl,
/* Length of versions */ /* Length of versions */
*p++ = 0x2; *p++ = 0x2;
/* Write values of supported version. /* Write values of supported versions.
* *
* They are come from configuration values. And * They are defined by the configuration.
* ssl_conf_check has valided the values.
* *
* Currently, only one vesrion is advertised. * Currently, only one version is advertised.
*/ */
mbedtls_ssl_write_version( ssl->conf->max_major_ver, mbedtls_ssl_write_version( ssl->conf->max_major_ver,
ssl->conf->max_minor_ver, ssl->conf->max_minor_ver,
@ -133,9 +132,9 @@ static int ssl_tls13_write_client_hello_cipher_suites(
unsigned char *end, unsigned char *end,
size_t *olen ) size_t *olen )
{ {
const int *cipher_suite_list; const int *ciphersuite_list;
unsigned char *cipher_suites_start; /* start of the cipher_suite_list */ unsigned char *cipher_suites_start; /* Start of the cipher_suites list */
unsigned char *cipher_suites_iter; /* iteration of the cipher_suite_list */ unsigned char *cipher_suites_iter; /* Iteration over the cipher_suites list */
size_t cipher_suites_len; size_t cipher_suites_len;
*olen = 0 ; *olen = 0 ;
@ -148,18 +147,18 @@ static int ssl_tls13_write_client_hello_cipher_suites(
* ( including secret key length ) and a hash to be used with * ( including secret key length ) and a hash to be used with
* HKDF, in descending order of client preference. * HKDF, in descending order of client preference.
*/ */
cipher_suite_list = ssl->conf->ciphersuite_list; ciphersuite_list = ssl->conf->ciphersuite_list;
/* Check there is space for the cipher suite list length (2 bytes). */ /* Check there is space for the cipher suite list length (2 bytes). */
MBEDTLS_SSL_CHK_BUF_PTR( buf, end, 2 ); MBEDTLS_SSL_CHK_BUF_PTR( buf, end, 2 );
/* Write cipher_suite_list */ /* Write cipher_suites */
cipher_suites_start = buf + 2; cipher_suites_start = buf + 2;
cipher_suites_iter = cipher_suites_start; cipher_suites_iter = cipher_suites_start;
for ( size_t i = 0; cipher_suite_list[i] != 0; i++ ) for ( size_t i = 0; ciphersuite_list[i] != 0; i++ )
{ {
int cipher_suite = cipher_suite_list[i]; int cipher_suite = ciphersuite_list[i];
const mbedtls_ssl_ciphersuite_t *ciphersuite_info; const mbedtls_ssl_ciphersuite_t *ciphersuite_info;
ciphersuite_info = mbedtls_ssl_ciphersuite_from_id( cipher_suite ); ciphersuite_info = mbedtls_ssl_ciphersuite_from_id( cipher_suite );
@ -179,7 +178,7 @@ static int ssl_tls13_write_client_hello_cipher_suites(
cipher_suites_iter += 2; cipher_suites_iter += 2;
} }
/* Write the cipher_suite_list length in number of bytes */ /* Write the cipher_suites length in number of bytes */
cipher_suites_len = cipher_suites_iter - cipher_suites_start; cipher_suites_len = cipher_suites_iter - cipher_suites_start;
MBEDTLS_PUT_UINT16_BE( cipher_suites_len, buf, 0 ); MBEDTLS_PUT_UINT16_BE( cipher_suites_len, buf, 0 );
MBEDTLS_SSL_DEBUG_MSG( 3, MBEDTLS_SSL_DEBUG_MSG( 3,
@ -211,7 +210,7 @@ static int ssl_tls13_write_client_hello_body( mbedtls_ssl_context *ssl,
{ {
int ret; int ret;
unsigned char *extensions_len_ptr; /* pointer of extensions length */ unsigned char *extensions_len_ptr; /* Pointer of extensions length */
size_t output_len; /* Length of buffer used by function */ size_t output_len; /* Length of buffer used by function */
size_t extensions_len; /* Length of the list of extensions*/ size_t extensions_len; /* Length of the list of extensions*/
@ -392,8 +391,8 @@ static int ssl_tls13_write_client_hello( mbedtls_ssl_context *ssl )
( ssl, buf, buf_len, &msg_len ) ); ( ssl, buf, buf_len, &msg_len ) );
mbedtls_ssl_tls13_add_hs_hdr_to_checksum( ssl, MBEDTLS_SSL_HS_CLIENT_HELLO, mbedtls_ssl_tls13_add_hs_hdr_to_checksum( ssl, MBEDTLS_SSL_HS_CLIENT_HELLO,
msg_len ); msg_len );
ssl->handshake->update_checksum( ssl, buf, 0 ); ssl->handshake->update_checksum( ssl, buf, msg_len );
MBEDTLS_SSL_PROC_CHK( ssl_tls13_finalize_client_hello, ( ssl ) ); MBEDTLS_SSL_PROC_CHK( ssl_tls13_finalize_client_hello, ( ssl ) );
MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_tls13_finish_handshake_msg, MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_tls13_finish_handshake_msg,
@ -420,8 +419,8 @@ int mbedtls_ssl_tls13_handshake_client_step( mbedtls_ssl_context *ssl )
switch( ssl->state ) switch( ssl->state )
{ {
/* /*
* ssl->state is initialized as HELLO_REQUEST. It is same * ssl->state is initialized as HELLO_REQUEST. It is the same
* with CLIENT_HELLO status * as CLIENT_HELLO state.
*/ */
case MBEDTLS_SSL_HELLO_REQUEST: case MBEDTLS_SSL_HELLO_REQUEST:
case MBEDTLS_SSL_CLIENT_HELLO: case MBEDTLS_SSL_CLIENT_HELLO:

4
library/ssl_tls13_generic.c
View File

@ -30,7 +30,7 @@
int mbedtls_ssl_tls13_start_handshake_msg( mbedtls_ssl_context *ssl, int mbedtls_ssl_tls13_start_handshake_msg( mbedtls_ssl_context *ssl,
unsigned hs_type, unsigned hs_type,
unsigned char **buf, unsigned char **buf,
size_t *buflen ) size_t *buf_len )
{ {
/* /*
* Reserve 4 bytes for hanshake header. ( Section 4,RFC 8446 ) * Reserve 4 bytes for hanshake header. ( Section 4,RFC 8446 )
@ -40,7 +40,7 @@ int mbedtls_ssl_tls13_start_handshake_msg( mbedtls_ssl_context *ssl,
* ... * ...
*/ */
*buf = ssl->out_msg + 4; *buf = ssl->out_msg + 4;
*buflen = MBEDTLS_SSL_OUT_CONTENT_LEN - 4; *buf_len = MBEDTLS_SSL_OUT_CONTENT_LEN - 4;
ssl->out_msgtype = MBEDTLS_SSL_MSG_HANDSHAKE; ssl->out_msgtype = MBEDTLS_SSL_MSG_HANDSHAKE;
ssl->out_msg[0] = hs_type; ssl->out_msg[0] = hs_type;