ARMmbed/mbedtls
1
0
Fork 0
mirror of https://github.com/ARMmbed/mbedtls.git synced 2025-06-26 15:07:59 +08:00
Code Issues Releases Wiki Activity

Rebase and solve conflicts

Browse Source 
Remove the double definition and change name

Signed-off-by: XiaokangQian <xiaokang.qian@arm.com>
This commit is contained in:
XiaokangQian 2021-10-28 05:50:31 +00:00
parent f13c56032f
commit f26f6ade0c
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/ssl_misc.h
View File

@ -522,14 +522,6 @@ typedef struct
unsigned char server_handshake_traffic_secret[ MBEDTLS_TLS1_3_MD_MAX_SIZE ]; unsigned char server_handshake_traffic_secret[ MBEDTLS_TLS1_3_MD_MAX_SIZE ];
} mbedtls_ssl_tls1_3_handshake_secrets; } mbedtls_ssl_tls1_3_handshake_secrets;
typedef struct
{
unsigned char client_application_traffic_secret_N[ MBEDTLS_TLS1_3_MD_MAX_SIZE ];
unsigned char server_application_traffic_secret_N[ MBEDTLS_TLS1_3_MD_MAX_SIZE ];
unsigned char exporter_master_secret [ MBEDTLS_TLS1_3_MD_MAX_SIZE ];
unsigned char resumption_master_secret [ MBEDTLS_TLS1_3_MD_MAX_SIZE ];
} mbedtls_ssl_tls1_3_application_secrets;
/* /*
* This structure contains the parameters only needed during handshake. * This structure contains the parameters only needed during handshake.
*/ */

4
library/ssl_tls13_keys.c
View File

@ -676,9 +676,9 @@ int mbedtls_ssl_tls1_3_calculate_expected_finished( mbedtls_ssl_context* ssl,
MBEDTLS_SSL_DEBUG_BUF( 4, "handshake hash", transcript, transcript_len ); MBEDTLS_SSL_DEBUG_BUF( 4, "handshake hash", transcript, transcript_len );
if( from == MBEDTLS_SSL_IS_CLIENT ) if( from == MBEDTLS_SSL_IS_CLIENT )
base_key = ssl->handshake->tls1_3_hs_secrets.client_handshake_traffic_secret; base_key = ssl->handshake->tls13_hs_secrets.client_handshake_traffic_secret;
else else
base_key = ssl->handshake->tls1_3_hs_secrets.server_handshake_traffic_secret; base_key = ssl->handshake->tls13_hs_secrets.server_handshake_traffic_secret;
ret = ssl_tls1_3_calc_finished_core( md_type, base_key, transcript, dst ); ret = ssl_tls1_3_calc_finished_core( md_type, base_key, transcript, dst );
if( ret != 0 ) if( ret != 0 )