eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Align coding stles and remove useless code

Browse source 
Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
This commit is contained in:
XiaokangQian 2021-11-15 03:33:57 +00:00
parent 35dc625e37
commit 0fa6643eb5
2 changed files with 15 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
library/ssl_tls13_client.c
View file

@ -1620,7 +1620,14 @@ static int ssl_tls1_3_process_server_finished( mbedtls_ssl_context *ssl )
*/ */
static int ssl_tls13_write_client_finished( mbedtls_ssl_context *ssl ) static int ssl_tls13_write_client_finished( mbedtls_ssl_context *ssl )
{ {
return ( mbedtls_ssl_tls13_write_finished_message( ssl ) ); int ret;
ret = mbedtls_ssl_tls13_write_finished_message( ssl );
if( ret != 0 )
return( ret );
mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_FLUSH_BUFFERS );
return( 0 );
} }
/* /*

29
library/ssl_tls13_generic.c
View file

@ -1046,21 +1046,8 @@ static int ssl_tls13_prepare_finished_message( mbedtls_ssl_context *ssl )
static int ssl_tls13_finalize_finished_message( mbedtls_ssl_context *ssl ) static int ssl_tls13_finalize_finished_message( mbedtls_ssl_context *ssl )
{ {
// TODO: Add back resumption keys calculation after MVP.
#if defined(MBEDTLS_SSL_CLI_C) ((void) ssl);
if( ssl->conf->endpoint == MBEDTLS_SSL_IS_CLIENT )
{
((void) ssl);
mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_FLUSH_BUFFERS );
}
else
#endif /* MBEDTLS_SSL_CLI_C */
{
((void) ssl);
/* Should never happen */
return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
}
return( 0 ); return( 0 );
} }
@ -1071,7 +1058,11 @@ static int ssl_tls13_write_finished_message_body( mbedtls_ssl_context *ssl,
size_t *olen ) size_t *olen )
{ {
size_t verify_data_len = ssl->handshake->state_local.finished_out.digest_len; size_t verify_data_len = ssl->handshake->state_local.finished_out.digest_len;
/*
* struct {
* opaque verify_data[Hash.length];
* } Finished;
*/
MBEDTLS_SSL_CHK_BUF_PTR( buf, end, verify_data_len ); MBEDTLS_SSL_CHK_BUF_PTR( buf, end, verify_data_len );
memcpy( buf, ssl->handshake->state_local.finished_out.digest, memcpy( buf, ssl->handshake->state_local.finished_out.digest,
@ -1090,12 +1081,6 @@ int mbedtls_ssl_tls13_write_finished_message( mbedtls_ssl_context *ssl )
MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> write finished message" ) ); MBEDTLS_SSL_DEBUG_MSG( 2, ( "=> write finished message" ) );
if( !ssl->handshake->state_local.finished_out.preparation_done )
{
MBEDTLS_SSL_PROC_CHK( ssl_tls13_prepare_finished_message( ssl ) );
ssl->handshake->state_local.finished_out.preparation_done = 1;
}
MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_tls13_start_handshake_msg( ssl, MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_tls13_start_handshake_msg( ssl,
MBEDTLS_SSL_HS_FINISHED, &buf, &buf_len ) ); MBEDTLS_SSL_HS_FINISHED, &buf, &buf_len ) );