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

fix write selected_version fail

Browse Source 
And rename write_supported_versions to
write selected_version

Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2022-04-14 20:52:56 +08:00
parent abf20c7564
commit 349a61388b
1 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
library/ssl_tls13_server.c
View File

@ -760,40 +760,31 @@ static int ssl_tls13_prepare_server_hello( mbedtls_ssl_context *ssl )
} }
/* /*
* ssl_tls13_write_supported_versions_ext(): * ssl_tls13_write_selected_version_ext():
* *
* struct { * struct {
* ProtocolVersion selected_version; * ProtocolVersion selected_version;
* } SupportedVersions; * } SupportedVersions;
*/ */
static int ssl_tls13_write_supported_versions_ext( mbedtls_ssl_context *ssl, static int ssl_tls13_write_selected_version_ext( mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *buf,
unsigned char *end, unsigned char *end,
size_t *out_len ) size_t *out_len )
{ {
unsigned char *p = buf;
*out_len = 0; *out_len = 0;
MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, write supported versions extension" ) ); MBEDTLS_SSL_DEBUG_MSG( 3, ( "server hello, write selected_version" ) );
/* Check if we have space to write the extension: /* Check if we have space to write the extension:
* - extension_type (2 bytes) * - extension_type (2 bytes)
* - extension_data_length (2 bytes) * - extension_data_length (2 bytes)
* - versions_length (1 byte ) * - selected_version (2 bytes)
* - versions (2 bytes)
*/ */
MBEDTLS_SSL_CHK_BUF_PTR( p, end, 7 ); MBEDTLS_SSL_CHK_BUF_PTR( buf, end, 6 );
/* Write extension_type */ MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_SUPPORTED_VERSIONS, buf, 0 );
MBEDTLS_PUT_UINT16_BE( MBEDTLS_TLS_EXT_SUPPORTED_VERSIONS, p, 0 );
/* Write extension_data_length */ MBEDTLS_PUT_UINT16_BE( 2, buf, 2 );
MBEDTLS_PUT_UINT16_BE( 3, p, 2 );
p += 4;
/* Length of versions */
*p++ = 0x2;
/* Write values of supported versions. /* Write values of supported versions.
* *
@ -801,12 +792,14 @@ static int ssl_tls13_write_supported_versions_ext( mbedtls_ssl_context *ssl,
* *
* Currently, only one version is advertised. * Currently, only one version is advertised.
*/ */
mbedtls_ssl_write_version( p, ssl->tls_version, ssl->conf->transport ); mbedtls_ssl_write_version( buf + 4,
ssl->conf->transport,
ssl->tls_version );
MBEDTLS_SSL_DEBUG_MSG( 3, ( "supported version: [%04x]", MBEDTLS_SSL_DEBUG_MSG( 3, ( "supported version: [%04x]",
ssl->tls_version ) ); ssl->tls_version ) );
*out_len = 7; *out_len = 6;
return( 0 ); return( 0 );
} }
@ -1007,10 +1000,10 @@ static int ssl_tls13_write_server_hello_body( mbedtls_ssl_context *ssl,
p += 2; p += 2;
/* Add supported_version extension */ /* Add supported_version extension */
if( ( ret = ssl_tls13_write_supported_versions_ext( if( ( ret = ssl_tls13_write_selected_version_ext(
ssl, p, end, &output_len ) ) != 0 ) ssl, p, end, &output_len ) ) != 0 )
{ {
MBEDTLS_SSL_DEBUG_RET( 1, "ssl_tls13_write_supported_versions_ext", MBEDTLS_SSL_DEBUG_RET( 1, "ssl_tls13_write_selected_version_ext",
ret ); ret );
return( ret ); return( ret );
} }