yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update comments in write server hello

Browse source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-04-21 09:31:58 +08:00
parent e74e04af1a
commit cfc04b3541
1 changed files with 28 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
library/ssl_tls13_server.c
View file

@ -925,12 +925,11 @@ static int ssl_tls13_write_server_hello_body( mbedtls_ssl_context *ssl,
*out_len = 0; *out_len = 0;
/* /* ...
* Write legacy_version * ProtocolVersion legacy_version = 0x0303; // TLS 1.2
* ProtocolVersion legacy_version = 0x0303; // TLS v1.2 * ...
* * with ProtocolVersion defined as:
* For TLS 1.3 we use the legacy version number {0x03, 0x03} * uint16 ProtocolVersion;
* instead of the true version number.
*/ */
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 2 ); MBEDTLS_SSL_CHK_BUF_PTR( p, end, 2 );
MBEDTLS_PUT_UINT16_BE( 0x0303, p, 0 ); MBEDTLS_PUT_UINT16_BE( 0x0303, p, 0 );
@ -939,6 +938,8 @@ static int ssl_tls13_write_server_hello_body( mbedtls_ssl_context *ssl,
/* ... /* ...
* Random random; * Random random;
* ... * ...
* with Random defined as:
* opaque Random[MBEDTLS_SERVER_HELLO_RANDOM_LEN];
*/ */
MBEDTLS_SSL_CHK_BUF_PTR( p, end, MBEDTLS_SERVER_HELLO_RANDOM_LEN ); MBEDTLS_SSL_CHK_BUF_PTR( p, end, MBEDTLS_SERVER_HELLO_RANDOM_LEN );
memcpy( p, server_randbytes, MBEDTLS_SERVER_HELLO_RANDOM_LEN ); memcpy( p, server_randbytes, MBEDTLS_SERVER_HELLO_RANDOM_LEN );
@ -950,8 +951,9 @@ static int ssl_tls13_write_server_hello_body( mbedtls_ssl_context *ssl,
ssl->session_negotiate->start = time( NULL ); ssl->session_negotiate->start = time( NULL );
#endif /* MBEDTLS_HAVE_TIME */ #endif /* MBEDTLS_HAVE_TIME */
/* /* ...
* Write legacy_session_id_echo * opaque legacy_session_id_echo<0..32>;
* ...
*/ */
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 1 + ssl->session_negotiate->id_len ); MBEDTLS_SSL_CHK_BUF_PTR( p, end, 1 + ssl->session_negotiate->id_len );
*p++ = (unsigned char)ssl->session_negotiate->id_len; *p++ = (unsigned char)ssl->session_negotiate->id_len;
@ -967,8 +969,11 @@ static int ssl_tls13_write_server_hello_body( mbedtls_ssl_context *ssl,
ssl->session_negotiate->id_len ); ssl->session_negotiate->id_len );
} }
/* /* ...
* Write ciphersuite * CipherSuite cipher_suite;
* ...
* with CipherSuite defined as:
* uint8 CipherSuite[2];
*/ */
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 2 ); MBEDTLS_SSL_CHK_BUF_PTR( p, end, 2 );
MBEDTLS_PUT_UINT16_BE( ssl->session_negotiate->ciphersuite, p, 0 ); MBEDTLS_PUT_UINT16_BE( ssl->session_negotiate->ciphersuite, p, 0 );
@ -979,11 +984,21 @@ static int ssl_tls13_write_server_hello_body( mbedtls_ssl_context *ssl,
ssl->session_negotiate->ciphersuite ), ssl->session_negotiate->ciphersuite ),
ssl->session_negotiate->ciphersuite ) ); ssl->session_negotiate->ciphersuite ) );
/* write legacy_compression_method = ( 0 ) */ /* ...
* uint8 legacy_compression_method = 0;
* ...
*/
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 1 ); MBEDTLS_SSL_CHK_BUF_PTR( p, end, 1 );
*p++ = 0x0; *p++ = 0x0;
/* Extensions */ /* ...
* Extension extensions<6..2^16-1>;
* ...
* struct {
* ExtensionType extension_type; (2 bytes)
* opaque extension_data<0..2^16-1>;
* } Extension;
*/
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 2 ); MBEDTLS_SSL_CHK_BUF_PTR( p, end, 2 );
p_extensions_len = p; p_extensions_len = p;
p += 2; p += 2;
@ -1000,13 +1015,13 @@ static int ssl_tls13_write_server_hello_body( mbedtls_ssl_context *ssl,
if( mbedtls_ssl_conf_tls13_some_ephemeral_enabled( ssl ) ) if( mbedtls_ssl_conf_tls13_some_ephemeral_enabled( ssl ) )
{ {
/* Add key_share extension */
ret = ssl_tls13_write_key_share_ext( ssl, p, end, &output_len ); ret = ssl_tls13_write_key_share_ext( ssl, p, end, &output_len );
if( ret != 0 ) if( ret != 0 )
return( ret ); return( ret );
p += output_len; p += output_len;
} }
/* Write length information */
MBEDTLS_PUT_UINT16_BE( p - p_extensions_len - 2, p_extensions_len, 0 ); MBEDTLS_PUT_UINT16_BE( p - p_extensions_len - 2, p_extensions_len, 0 );
MBEDTLS_SSL_DEBUG_BUF( 4, "server hello extensions", MBEDTLS_SSL_DEBUG_BUF( 4, "server hello extensions",