AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix various issues

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2021-10-08 15:14:45 +08:00
parent d96a5c2d86
commit c1ddeef53a
4 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/ssl_misc.h
View File

@ -1501,9 +1501,7 @@ int mbedtls_ssl_tls13_start_handshake_msg( mbedtls_ssl_context *ssl,
int mbedtls_ssl_tls13_finish_handshake_msg( mbedtls_ssl_context *ssl, int mbedtls_ssl_tls13_finish_handshake_msg( mbedtls_ssl_context *ssl,
size_t buf_len, size_t buf_len,
size_t msg_len ); size_t msg_len );
/*
* Update checksum with handshake header
*/
void mbedtls_ssl_tls13_add_hs_hdr_to_checksum( mbedtls_ssl_context *ssl, void mbedtls_ssl_tls13_add_hs_hdr_to_checksum( mbedtls_ssl_context *ssl,
unsigned hs_type, unsigned hs_type,
size_t total_hs_len ); size_t total_hs_len );

3
library/ssl_msg.c
View File

@ -5558,9 +5558,6 @@ void mbedtls_ssl_transform_free( mbedtls_ssl_transform *transform )
void mbedtls_ssl_set_inbound_transform( mbedtls_ssl_context *ssl, void mbedtls_ssl_set_inbound_transform( mbedtls_ssl_context *ssl,
mbedtls_ssl_transform *transform ) mbedtls_ssl_transform *transform )
{ {
if( ssl->transform_in == transform )
return;
ssl->transform_in = transform; ssl->transform_in = transform;
mbedtls_platform_zeroize( ssl->in_ctr, MBEDTLS_SSL_COUNTER_LEN ); mbedtls_platform_zeroize( ssl->in_ctr, MBEDTLS_SSL_COUNTER_LEN );
} }

20
library/ssl_tls.c
View File

@ -7062,20 +7062,22 @@ int mbedtls_ssl_get_handshake_transcript( mbedtls_ssl_context *ssl,
size_t dst_len, size_t dst_len,
size_t *olen ) size_t *olen )
{ {
switch( md )
{
#if defined(MBEDTLS_SHA384_C) #if defined(MBEDTLS_SHA384_C)
if( md == MBEDTLS_MD_SHA384 ) case MBEDTLS_MD_SHA384:
{
return( ssl_get_handshake_transcript_sha384( ssl, dst, dst_len, olen ) ); return( ssl_get_handshake_transcript_sha384( ssl, dst, dst_len, olen ) );
} #endif /* MBEDTLS_SHA384_C */
else
#endif /* MBEDTLS_SHA512_C */
#if defined(MBEDTLS_SHA256_C) #if defined(MBEDTLS_SHA256_C)
if( md == MBEDTLS_MD_SHA256 ) case MBEDTLS_MD_SHA256:
{
return( ssl_get_handshake_transcript_sha256( ssl, dst, dst_len, olen ) ); return( ssl_get_handshake_transcript_sha256( ssl, dst, dst_len, olen ) );
}
else
#endif /* MBEDTLS_SHA256_C */ #endif /* MBEDTLS_SHA256_C */
default:
break;
}
return( MBEDTLS_ERR_SSL_INTERNAL_ERROR ); return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
} }
#endif /* !MBEDTLS_USE_PSA_CRYPTO */ #endif /* !MBEDTLS_USE_PSA_CRYPTO */

8
library/ssl_tls13_keys.h
View File

@ -534,22 +534,18 @@ int mbedtls_ssl_tls13_populate_transform( mbedtls_ssl_transform *transform,
/* /*
* TLS 1.3 key schedule evolutions * TLS 1.3 key schedule evolutions
* *
* Early Data -> Handshake -> Application * Early -> Handshake -> Application
* *
* Small wrappers around mbedtls_ssl_tls1_3_evolve_secret(). * Small wrappers around mbedtls_ssl_tls1_3_evolve_secret().
*/ */
/** /**
* \brief Begin TLS 1.3 key schedule by calculating early secret * \brief Begin TLS 1.3 key schedule by calculating early secret.
* from chosen PSK.
* *
* The TLS 1.3 key schedule can be viewed as a simple state machine * The TLS 1.3 key schedule can be viewed as a simple state machine
* with states Initial -> Early -> Handshake -> Application, and * with states Initial -> Early -> Handshake -> Application, and
* this function represents the Initial -> Early transition. * this function represents the Initial -> Early transition.
* *
* In the early stage, mbedtls_ssl_tls1_3_generate_early_data_keys()
* can be used to derive the 0-RTT traffic keys.
*
* \param ssl The SSL context to operate on. * \param ssl The SSL context to operate on.
* *
* \returns \c 0 on success. * \returns \c 0 on success.