1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-08-01 10:06:53 +03:00

Rebase and solve conflicts

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

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 );
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 )