From f26f6ade0c650dded604bd3350460593cb2ae77f Mon Sep 17 00:00:00 2001 From: XiaokangQian Date: Thu, 28 Oct 2021 05:50:31 +0000 Subject: [PATCH] Rebase and solve conflicts Remove the double definition and change name Signed-off-by: XiaokangQian --- library/ssl_misc.h | 8 -------- library/ssl_tls13_keys.c | 4 ++-- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/library/ssl_misc.h b/library/ssl_misc.h index 3b0d61b35c..7044769a2a 100644 --- a/library/ssl_misc.h +++ b/library/ssl_misc.h @@ -522,14 +522,6 @@ typedef struct unsigned char server_handshake_traffic_secret[ MBEDTLS_TLS1_3_MD_MAX_SIZE ]; } 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. */ diff --git a/library/ssl_tls13_keys.c b/library/ssl_tls13_keys.c index 2127393fc9..5bd3e47196 100644 --- a/library/ssl_tls13_keys.c +++ b/library/ssl_tls13_keys.c @@ -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 ); 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 - 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 ); if( ret != 0 )