lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

Address some comments

Browse Source 
Hostname_len has at least one byte
Change structure serialized_session_tls13
Fix various issues

Signed-off-by: Xiaokang Qian <xiaokang.qian@arm.com>
This commit is contained in:
Xiaokang Qian
2022-09-28 07:11:02 +00:00
parent 281fd1bdd8
commit ecd7528c7f
2 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/ssl_client.c
View File

@ -79,7 +79,7 @@ static int ssl_write_hostname_ext( mbedtls_ssl_context *ssl,
{ {
ssl->session_negotiate->hostname = mbedtls_calloc( 1, hostname_len ); ssl->session_negotiate->hostname = mbedtls_calloc( 1, hostname_len );
if( ssl->session_negotiate->hostname == NULL ) if( ssl->session_negotiate->hostname == NULL )
return MBEDTLS_ERR_SSL_ALLOC_FAILED; return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
memcpy(ssl->session_negotiate->hostname, ssl->hostname, hostname_len); memcpy(ssl->session_negotiate->hostname, ssl->hostname, hostname_len);
} }
ssl->session_negotiate->hostname_len = hostname_len; ssl->session_negotiate->hostname_len = hostname_len;

13
library/ssl_tls.c
View File

@ -300,12 +300,11 @@ int mbedtls_ssl_session_copy( mbedtls_ssl_session *dst,
#if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION) #if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION)
if( src->hostname != NULL ) if( src->hostname != NULL )
{ {
dst->hostname = mbedtls_calloc( 1, src->hostname_len + 1 ); dst->hostname = mbedtls_calloc( 1, src->hostname_len );
if( dst->hostname == NULL ) if( dst->hostname == NULL )
return( MBEDTLS_ERR_SSL_ALLOC_FAILED ); return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
memcpy( dst->hostname, src->hostname, src->hostname_len ); memcpy( dst->hostname, src->hostname, src->hostname_len );
dst->hostname[src->hostname_len] = '\0';
} }
#endif #endif
@ -1957,6 +1956,7 @@ mbedtls_ssl_mode_t mbedtls_ssl_get_mode_from_ciphersuite(
* uint32 ticket_age_add; * uint32 ticket_age_add;
* uint8 ticket_flags; * uint8 ticket_flags;
* opaque resumption_key<0..255>; * opaque resumption_key<0..255>;
* opaque hostname<1..2^8-1>;
* select ( endpoint ) { * select ( endpoint ) {
* case client: ClientOnlyData; * case client: ClientOnlyData;
* case server: uint64 start_time; * case server: uint64 start_time;
@ -2021,14 +2021,14 @@ static int ssl_tls13_session_save( const mbedtls_ssl_session *session,
memcpy( p, session->resumption_key, session->resumption_key_len ); memcpy( p, session->resumption_key, session->resumption_key_len );
p += session->resumption_key_len; p += session->resumption_key_len;
p[0] = session->hostname_len;
p++;
#if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION) && defined(MBEDTLS_SSL_CLI_C) #if defined(MBEDTLS_SSL_SERVER_NAME_INDICATION) && defined(MBEDTLS_SSL_CLI_C)
if( session->endpoint == MBEDTLS_SSL_IS_CLIENT && if( session->endpoint == MBEDTLS_SSL_IS_CLIENT &&
session->hostname_len != 0 && session->hostname_len > 0 &&
session->hostname != NULL ) session->hostname != NULL )
{ {
/* save host name */ /* save host name */
p[0] = session->hostname_len;
p++;
memcpy( p, session->hostname, session->hostname_len ); memcpy( p, session->hostname, session->hostname_len );
p += session->hostname_len; p += session->hostname_len;
} }
@ -2100,12 +2100,15 @@ static int ssl_tls13_session_load( mbedtls_ssl_session *session,
p += 1; p += 1;
if( end - p < session->hostname_len ) if( end - p < session->hostname_len )
return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA ); return( MBEDTLS_ERR_SSL_BAD_INPUT_DATA );
if( session->hostname_len > 0 )
{
session->hostname = mbedtls_calloc( 1, session->hostname_len ); session->hostname = mbedtls_calloc( 1, session->hostname_len );
if( session->hostname == NULL ) if( session->hostname == NULL )
return( MBEDTLS_ERR_SSL_ALLOC_FAILED ); return( MBEDTLS_ERR_SSL_ALLOC_FAILED );
memcpy( session->hostname, p, session->hostname_len ); memcpy( session->hostname, p, session->hostname_len );
p += session->hostname_len; p += session->hostname_len;
} }
}
#endif /* MBEDTLS_SSL_SERVER_NAME_INDICATION && MBEDTLS_SSL_CLI_C */ #endif /* MBEDTLS_SSL_SERVER_NAME_INDICATION && MBEDTLS_SSL_CLI_C */
#if defined(MBEDTLS_HAVE_TIME) && defined(MBEDTLS_SSL_SRV_C) #if defined(MBEDTLS_HAVE_TIME) && defined(MBEDTLS_SSL_SRV_C)