From 814feffd15c9d2b9ccb5bb5449d4da356b35f8a4 Mon Sep 17 00:00:00 2001 From: Andrzej Kurek Date: Mon, 14 Jan 2019 04:35:19 -0500 Subject: [PATCH] Whitespace, logging and documentation fixes Introduce a psa_status_t status to handle return values. Add a debug message with API usage description. --- include/mbedtls/ssl_internal.h | 2 +- library/ssl_tls.c | 34 ++++++++++++++++++++++------------ 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/include/mbedtls/ssl_internal.h b/include/mbedtls/ssl_internal.h index a13feb55c..f1148af32 100644 --- a/include/mbedtls/ssl_internal.h +++ b/include/mbedtls/ssl_internal.h @@ -765,7 +765,7 @@ int mbedtls_ssl_get_key_exchange_md_ssl_tls( mbedtls_ssl_context *ssl, #if defined(MBEDTLS_SSL_PROTO_TLS1) || defined(MBEDTLS_SSL_PROTO_TLS1_1) || \ defined(MBEDTLS_SSL_PROTO_TLS1_2) -// The hash buffer must have at least MBEDTLS_MD_MAX_SIZE bytes of length. +/* The hash buffer must have at least MBEDTLS_MD_MAX_SIZE bytes of length. */ int mbedtls_ssl_get_key_exchange_md_tls1_2( mbedtls_ssl_context *ssl, unsigned char *hash, size_t *hashlen, unsigned char *data, size_t data_len, diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 99b99285e..675150d56 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -9984,44 +9984,51 @@ int mbedtls_ssl_get_key_exchange_md_tls1_2( mbedtls_ssl_context *ssl, unsigned char *data, size_t data_len, mbedtls_md_type_t md_alg ) { - int ret = 0; + psa_status_t status; psa_hash_operation_t hash_operation; psa_algorithm_t hash_alg = mbedtls_psa_translate_md( md_alg ); - if( ( ret = psa_hash_setup( &hash_operation, hash_alg ) ) != PSA_SUCCESS ) + MBEDTLS_SSL_DEBUG_MSG( 2, ( "Perform PSA-based computation of digest \ + of ServerKeyExchange" ) ); + + if( ( status = psa_hash_setup( &hash_operation, + hash_alg ) ) != PSA_SUCCESS ) { - MBEDTLS_SSL_DEBUG_RET( 1, "psa_hash_setup", ret ); + MBEDTLS_SSL_DEBUG_RET( 1, "psa_hash_setup", status ); goto exit; } - if( ( ret = psa_hash_update( &hash_operation, ssl->handshake->randbytes, 64 ) ) != PSA_SUCCESS ) + if( ( status = psa_hash_update( &hash_operation, ssl->handshake->randbytes, + 64 ) ) != PSA_SUCCESS ) { - MBEDTLS_SSL_DEBUG_RET( 1, "psa_hash_update", ret ); + MBEDTLS_SSL_DEBUG_RET( 1, "psa_hash_update", status ); goto exit; } - if( ( ret = psa_hash_update( &hash_operation, data, data_len ) ) != PSA_SUCCESS ) + if( ( status = psa_hash_update( &hash_operation, + data, data_len ) ) != PSA_SUCCESS ) { - MBEDTLS_SSL_DEBUG_RET( 1, "psa_hash_update", ret ); + MBEDTLS_SSL_DEBUG_RET( 1, "psa_hash_update", status ); goto exit; } - if( ( ret = psa_hash_finish( &hash_operation, hash, MBEDTLS_MD_MAX_SIZE, hashlen ) ) != PSA_SUCCESS ) + if( ( status = psa_hash_finish( &hash_operation, hash, MBEDTLS_MD_MAX_SIZE, + hashlen ) ) != PSA_SUCCESS ) { - MBEDTLS_SSL_DEBUG_RET( 1, "psa_hash_finish", ret ); + MBEDTLS_SSL_DEBUG_RET( 1, "psa_hash_finish", status ); goto exit; } exit: - if( ret != 0 ) + if( status != PSA_SUCCESS ) { mbedtls_ssl_send_alert_message( ssl, MBEDTLS_SSL_ALERT_LEVEL_FATAL, MBEDTLS_SSL_ALERT_MSG_INTERNAL_ERROR ); - switch(ret) + switch( status ) { case PSA_ERROR_NOT_SUPPORTED: return( MBEDTLS_ERR_MD_FEATURE_UNAVAILABLE ); - case PSA_ERROR_BAD_STATE: // Intentional fallthrough + case PSA_ERROR_BAD_STATE: /* Intentional fallthrough */ case PSA_ERROR_BUFFER_TOO_SMALL: return( MBEDTLS_ERR_MD_BAD_INPUT_DATA ); case PSA_ERROR_INSUFFICIENT_MEMORY: @@ -10045,6 +10052,9 @@ int mbedtls_ssl_get_key_exchange_md_tls1_2( mbedtls_ssl_context *ssl, const mbedtls_md_info_t *md_info = mbedtls_md_info_from_type( md_alg ); *hashlen = mbedtls_md_get_size( md_info ); + MBEDTLS_SSL_DEBUG_MSG( 2, ( "Perform mbedtls-based computation of digest \ + of ServerKeyExchange" ) ); + mbedtls_md_init( &ctx ); /*