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

Rebase and change code

Browse source 
Solve conflicts.
Rename functions
Align coding style

Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
This commit is contained in:
XiaokangQian 2021-11-09 12:30:09 +00:00
parent e1655e4db8
commit cc90c94413
4 changed files with 17 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
library/ssl_misc.h
View file

@ -1185,6 +1185,7 @@ int mbedtls_ssl_write_record( mbedtls_ssl_context *ssl, uint8_t force_flush );
int mbedtls_ssl_flush_output( mbedtls_ssl_context *ssl ); int mbedtls_ssl_flush_output( mbedtls_ssl_context *ssl );
int mbedtls_ssl_tls13_process_finished_message( mbedtls_ssl_context *ssl ); int mbedtls_ssl_tls13_process_finished_message( mbedtls_ssl_context *ssl );
int mbedtls_ssl_tls13_write_finished_message( mbedtls_ssl_context *ssl );
int mbedtls_ssl_parse_certificate( mbedtls_ssl_context *ssl ); int mbedtls_ssl_parse_certificate( mbedtls_ssl_context *ssl );
int mbedtls_ssl_write_certificate( mbedtls_ssl_context *ssl ); int mbedtls_ssl_write_certificate( mbedtls_ssl_context *ssl );

2
library/ssl_tls13_client.c
View file

@ -1620,7 +1620,7 @@ 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_process_finished_out( ssl ) ); return ( mbedtls_ssl_tls13_write_finished_message( ssl ) );
} }
/* /*

37
library/ssl_tls13_generic.c
View file

@ -975,7 +975,7 @@ cleanup:
} }
#endif /* MBEDTLS_SSL_CLI_C */ #endif /* MBEDTLS_SSL_CLI_C */
static int ssl_tls13_postprocess_finished_message( mbedtls_ssl_context* ssl ) static int ssl_tls13_postprocess_finished_message( mbedtls_ssl_context *ssl )
{ {
#if defined(MBEDTLS_SSL_CLI_C) #if defined(MBEDTLS_SSL_CLI_C)
@ -1017,7 +1017,7 @@ cleanup:
/* /*
* *
* STATE HANDLING: Outgoing Finished * STATE HANDLING: Write and send Finished message.
* *
*/ */
@ -1027,15 +1027,15 @@ cleanup:
/* Main entry point: orchestrates the other functions */ /* Main entry point: orchestrates the other functions */
static int ssl_prepare_finished_out( mbedtls_ssl_context *ssl ); static int ssl_prepare_finished_message( mbedtls_ssl_context *ssl );
static int ssl_write_finished_out( mbedtls_ssl_context *ssl, static int ssl_tls13_write_finished_message_bod( mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *buf,
size_t buflen, size_t buflen,
size_t *olen ); size_t *olen );
static int ssl_postprocess_finished_out( mbedtls_ssl_context *ssl ); static int ssl_tls13_finalize_finished_message( mbedtls_ssl_context *ssl );
int mbedtls_ssl_tls13_process_finished_out( mbedtls_ssl_context *ssl ) int mbedtls_ssl_tls13_write_finished_message( mbedtls_ssl_context *ssl )
{ {
int ret; int ret;
unsigned char *buf; unsigned char *buf;
@ -1045,20 +1045,20 @@ int mbedtls_ssl_tls13_process_finished_out( mbedtls_ssl_context *ssl )
if( !ssl->handshake->state_local.finished_out.preparation_done ) if( !ssl->handshake->state_local.finished_out.preparation_done )
{ {
MBEDTLS_SSL_PROC_CHK( ssl_prepare_finished_out( ssl ) ); MBEDTLS_SSL_PROC_CHK( ssl_prepare_finished_message( ssl ) );
ssl->handshake->state_local.finished_out.preparation_done = 1; 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 ) );
MBEDTLS_SSL_PROC_CHK( ssl_write_finished_out( MBEDTLS_SSL_PROC_CHK( ssl_tls13_write_finished_message_bod(
ssl, buf, buf_len, &msg_len ) ); ssl, buf, buf_len, &msg_len ) );
mbedtls_ssl_tls1_3_add_hs_msg_to_checksum( ssl, MBEDTLS_SSL_HS_FINISHED, mbedtls_ssl_tls1_3_add_hs_msg_to_checksum( ssl, MBEDTLS_SSL_HS_FINISHED,
buf, msg_len ); buf, msg_len );
MBEDTLS_SSL_PROC_CHK( ssl_postprocess_finished_out( ssl ) ); MBEDTLS_SSL_PROC_CHK( ssl_tls13_finalize_finished_message( ssl ) );
MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_tls13_finish_handshake_msg( ssl, MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_tls13_finish_handshake_msg( ssl,
buf_len, msg_len ) ); buf_len, msg_len ) );
MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_flush_output( ssl ) ); MBEDTLS_SSL_PROC_CHK( mbedtls_ssl_flush_output( ssl ) );
@ -1069,12 +1069,12 @@ cleanup:
return( ret ); return( ret );
} }
static int ssl_prepare_finished_out( mbedtls_ssl_context *ssl ) static int ssl_prepare_finished_message( mbedtls_ssl_context *ssl )
{ {
int ret; int ret;
/* Compute transcript of handshake up to now. */ /* Compute transcript of handshake up to now. */
ret = mbedtls_ssl_tls1_3_calculate_expected_finished( ssl, ret = mbedtls_ssl_tls13_calculate_verify_data( ssl,
ssl->handshake->state_local.finished_out.digest, ssl->handshake->state_local.finished_out.digest,
sizeof( ssl->handshake->state_local.finished_out.digest ), sizeof( ssl->handshake->state_local.finished_out.digest ),
&ssl->handshake->state_local.finished_out.digest_len, &ssl->handshake->state_local.finished_out.digest_len,
@ -1089,21 +1089,14 @@ static int ssl_prepare_finished_out( mbedtls_ssl_context *ssl )
return( 0 ); return( 0 );
} }
static int ssl_postprocess_finished_out( mbedtls_ssl_context *ssl ) static int ssl_tls13_finalize_finished_message( mbedtls_ssl_context *ssl )
{ {
int ret = 0;
#if defined(MBEDTLS_SSL_CLI_C) #if defined(MBEDTLS_SSL_CLI_C)
if( ssl->conf->endpoint == MBEDTLS_SSL_IS_CLIENT ) if( ssl->conf->endpoint == MBEDTLS_SSL_IS_CLIENT )
{ {
/* Compute resumption_master_secret */ /* Compute resumption_master_secret */
ret = mbedtls_ssl_tls1_3_generate_resumption_master_secret( ssl ); ((void) ssl);
if( ret != 0 )
{
MBEDTLS_SSL_DEBUG_RET( 1,
"mbedtls_ssl_tls1_3_generate_resumption_master_secret ", ret );
return ( ret );
}
mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_FLUSH_BUFFERS ); mbedtls_ssl_handshake_set_state( ssl, MBEDTLS_SSL_FLUSH_BUFFERS );
} }
@ -1118,7 +1111,7 @@ static int ssl_postprocess_finished_out( mbedtls_ssl_context *ssl )
return( 0 ); return( 0 );
} }
static int ssl_write_finished_out( mbedtls_ssl_context *ssl, static int ssl_tls13_write_finished_message_bod( mbedtls_ssl_context *ssl,
unsigned char *buf, unsigned char *buf,
size_t buflen, size_t buflen,
size_t *olen ) size_t *olen )

7
library/ssl_tls13_keys.c
View file

@ -593,13 +593,6 @@ int mbedtls_ssl_tls13_key_schedule_stage_application( mbedtls_ssl_context *ssl )
return( 0 ); return( 0 );
} }
int mbedtls_ssl_tls1_3_generate_resumption_master_secret(
mbedtls_ssl_context *ssl )
{
((void) ssl);
return( 0 );
}
static int ssl_tls1_3_calc_finished_core( mbedtls_md_type_t md_type, static int ssl_tls1_3_calc_finished_core( mbedtls_md_type_t md_type,
unsigned char const *base_key, unsigned char const *base_key,
unsigned char const *transcript, unsigned char const *transcript,