lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-29 11:41:15 +03:00
Code Activity

fix various issues

Browse Source 
Signed-off-by: Jerry Yu <jerry.h.yu@arm.com>
This commit is contained in:
Jerry Yu
2021-09-16 13:14:15 +08:00
parent a63de352dc
commit e3131ef7f3
4 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/ssl_misc.h
View File

@ -1532,7 +1532,7 @@ void mbedtls_ssl_tls13_add_hs_hdr_to_checksum( mbedtls_ssl_context *ssl,
size_t total_hs_len ); size_t total_hs_len );
/* /*
* Update checksum of handshake message * Update checksum of handshake messages.
*/ */
void mbedtls_ssl_tls13_add_hs_msg_to_checksum( mbedtls_ssl_context *ssl, void mbedtls_ssl_tls13_add_hs_msg_to_checksum( mbedtls_ssl_context *ssl,
unsigned hs_type, unsigned hs_type,

2
library/ssl_msg.c
View File

@ -5565,7 +5565,7 @@ void mbedtls_ssl_set_outbound_transform( mbedtls_ssl_context *ssl,
mbedtls_ssl_transform *transform ) mbedtls_ssl_transform *transform )
{ {
ssl->transform_out = transform; ssl->transform_out = transform;
mbedtls_platform_zeroize( ssl->cur_out_ctr, 8 ); mbedtls_platform_zeroize( ssl->cur_out_ctr, sizeof( ssl->cur_out_ctr ) );
} }
#if defined(MBEDTLS_SSL_PROTO_DTLS) #if defined(MBEDTLS_SSL_PROTO_DTLS)

36
library/ssl_tls13_keys.c
View File

@ -21,14 +21,16 @@
#if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL) #if defined(MBEDTLS_SSL_PROTO_TLS1_3_EXPERIMENTAL)
#include "mbedtls/hkdf.h"
#include "ssl_misc.h"
#include "ssl_tls13_keys.h"
#include "mbedtls/debug.h"
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include "mbedtls/hkdf.h"
#include "mbedtls/debug.h"
#include "mbedtls/error.h"
#include "ssl_misc.h"
#include "ssl_tls13_keys.h"
#define MBEDTLS_SSL_TLS1_3_LABEL( name, string ) \ #define MBEDTLS_SSL_TLS1_3_LABEL( name, string ) \
.name = string, .name = string,
@ -820,24 +822,25 @@ int mbedtls_ssl_tls13_populate_transform( mbedtls_ssl_transform *transform,
return( 0 ); return( 0 );
} }
int mbedtls_ssl_tls13_key_schedule_stage_early_data( mbedtls_ssl_context *ssl ) int mbedtls_ssl_tls13_key_schedule_stage_early( mbedtls_ssl_context *ssl )
{ {
int ret = 0; int ret = MBEDTLS_ERR_ERROR_CORRUPTION_DETECTED;
mbedtls_md_type_t md_type;
const unsigned char *input = NULL;
size_t input_len = 0;
if( ssl->handshake->ciphersuite_info == NULL ) if( ssl->handshake->ciphersuite_info == NULL )
{ {
MBEDTLS_SSL_DEBUG_MSG( 1, ( "cipher suite info not found" ) ); MBEDTLS_SSL_DEBUG_MSG( 1, ( "cipher suite info not found" ) );
return( MBEDTLS_ERR_SSL_INTERNAL_ERROR ); return( MBEDTLS_ERR_SSL_INTERNAL_ERROR );
} }
mbedtls_md_type_t const md_type = ssl->handshake->ciphersuite_info->mac;
const unsigned char *input = NULL; md_type = ssl->handshake->ciphersuite_info->mac;
size_t input_len = 0;
#if defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED) #if defined(MBEDTLS_KEY_EXCHANGE_SOME_PSK_ENABLED)
input = ssl->handshake->psk; input = ssl->handshake->psk;
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->tls13_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 );
@ -876,9 +879,9 @@ int mbedtls_ssl_tls13_generate_handshake_keys( mbedtls_ssl_context *ssl,
md_size = mbedtls_md_get_size( md_info ); md_size = mbedtls_md_get_size( md_info );
ret = mbedtls_ssl_get_handshake_transcript( ssl, md_type, ret = mbedtls_ssl_get_handshake_transcript( ssl, md_type,
transcript, transcript,
sizeof( transcript ), sizeof( transcript ),
&transcript_len ); &transcript_len );
if( ret != 0 ) if( ret != 0 )
{ {
MBEDTLS_SSL_DEBUG_RET( 1, MBEDTLS_SSL_DEBUG_RET( 1,
@ -893,7 +896,8 @@ int mbedtls_ssl_tls13_generate_handshake_keys( mbedtls_ssl_context *ssl,
&ssl->handshake->tls13_hs_secrets ); &ssl->handshake->tls13_hs_secrets );
if( ret != 0 ) if( ret != 0 )
{ {
MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ssl_tls1_3_derive_early_secrets", ret ); MBEDTLS_SSL_DEBUG_RET( 1, "mbedtls_ssl_tls1_3_derive_handshake_secrets",
ret );
return( ret ); return( ret );
} }

2
library/ssl_tls13_keys.h
View File

@ -534,7 +534,7 @@ 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_data( mbedtls_ssl_context *ssl ); int mbedtls_ssl_tls13_key_schedule_stage_early( mbedtls_ssl_context *ssl );
/** /**
* \brief Compute TLS 1.3 handshake traffic keys. * \brief Compute TLS 1.3 handshake traffic keys.