mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-17 20:42:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix tls1_3 prefix issues

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu 2021-09-18 16:09:01 +08:00
parent 92c1ca221f
commit 4836952f9d
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/ssl_misc.h
View File

@ -681,7 +681,7 @@ struct mbedtls_ssl_handshake_params
unsigned char early [MBEDTLS_MD_MAX_SIZE]; unsigned char early [MBEDTLS_MD_MAX_SIZE];
unsigned char handshake[MBEDTLS_MD_MAX_SIZE]; unsigned char handshake[MBEDTLS_MD_MAX_SIZE];
unsigned char app [MBEDTLS_MD_MAX_SIZE]; unsigned char app [MBEDTLS_MD_MAX_SIZE];
} tls13_master_secrets; } tls1_3_master_secrets;
#endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */ #endif /* MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL */
#if defined(MBEDTLS_SSL_SESSION_TICKETS) #if defined(MBEDTLS_SSL_SESSION_TICKETS)
@ -1511,7 +1511,7 @@ void mbedtls_ssl_tls13_add_hs_hdr_to_checksum( mbedtls_ssl_context *ssl,
/* /*
* Update checksum of handshake messages. * Update checksum of handshake messages.
*/ */
void mbedtls_ssl_tls13_add_hs_msg_to_checksum( mbedtls_ssl_context *ssl, void mbedtls_ssl_tls1_3_add_hs_msg_to_checksum( mbedtls_ssl_context *ssl,
unsigned hs_type, unsigned hs_type,
unsigned char const *msg, unsigned char const *msg,
size_t msg_len ); size_t msg_len );

2
library/ssl_tls13_generic.c
View File

@ -66,7 +66,7 @@ cleanup:
return( ret ); return( ret );
} }
void mbedtls_ssl_tls13_add_hs_msg_to_checksum( mbedtls_ssl_context *ssl, void mbedtls_ssl_tls1_3_add_hs_msg_to_checksum( mbedtls_ssl_context *ssl,
unsigned hs_type, unsigned hs_type,
unsigned char const *msg, unsigned char const *msg,
size_t msg_len ) size_t msg_len )

4
library/ssl_tls13_keys.c
View File

@ -822,7 +822,7 @@ int mbedtls_ssl_tls13_populate_transform( mbedtls_ssl_transform *transform,
return( 0 ); return( 0 );
} }
int mbedtls_ssl_tls13_key_schedule_stage_early( mbedtls_ssl_context *ssl ) int mbedtls_ssl_tls1_3_key_schedule_stage_early( mbedtls_ssl_context *ssl )
{ {
int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
mbedtls_md_type_t md_type; mbedtls_md_type_t md_type;
@ -840,7 +840,7 @@ int mbedtls_ssl_tls13_key_schedule_stage_early( mbedtls_ssl_context *ssl )
input_len = ssl->handshake->psk_len; input_len = ssl->handshake->psk_len;
#endif #endif
ret = mbedtls_ssl_tls1_3_evolve_secret( md_type, NULL, input, input_len, ret = mbedtls_ssl_tls1_3_evolve_secret( md_type, NULL, input, input_len,
ssl->handshake->tls13_master_secrets.early ); ssl->handshake->tls1_3_master_secrets.early );
if( ret != 0 ) if( ret != 0 )
{ {
MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ssl_tls1_3_evolve_secret", ret ); MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ssl_tls1_3_evolve_secret", ret );

2
library/ssl_tls13_keys.h
View File

@ -555,6 +555,6 @@ int mbedtls_ssl_tls13_populate_transform( mbedtls_ssl_transform *transform,
* \returns \c 0 on success. * \returns \c 0 on success.
* \returns A negative error code on failure. * \returns A negative error code on failure.
*/ */
int mbedtls_ssl_tls13_key_schedule_stage_early( mbedtls_ssl_context *ssl ); int mbedtls_ssl_tls1_3_key_schedule_stage_early( mbedtls_ssl_context *ssl );
#endif /* MBEDTLS_SSL_TLS1_3_KEYS_H */ #endif /* MBEDTLS_SSL_TLS1_3_KEYS_H */