Minor formatting fixes to address code review comments

Signed-off-by: Aditya Deshpande <aditya.deshpande@arm.com>
This commit is contained in:
Aditya Deshpande 2022-11-29 16:53:29 +00:00
parent 1ac41dec09
commit b6bc7524f9
3 changed files with 8 additions and 10 deletions

View File

@ -477,16 +477,17 @@ psa_status_t mbedtls_psa_key_agreement_ecdh(
uint8_t *shared_secret, size_t shared_secret_size, uint8_t *shared_secret, size_t shared_secret_size,
size_t *shared_secret_length ) size_t *shared_secret_length )
{ {
psa_status_t status;
if( ! PSA_KEY_TYPE_IS_ECC_KEY_PAIR( attributes->core.type ) || if( ! PSA_KEY_TYPE_IS_ECC_KEY_PAIR( attributes->core.type ) ||
! PSA_ALG_IS_ECDH(alg) ) ! PSA_ALG_IS_ECDH(alg) )
return( PSA_ERROR_INVALID_ARGUMENT ); return( PSA_ERROR_INVALID_ARGUMENT );
mbedtls_ecp_keypair *ecp = NULL; mbedtls_ecp_keypair *ecp = NULL;
psa_status_t status = mbedtls_psa_ecp_load_representation( status = mbedtls_psa_ecp_load_representation(
attributes->core.type, attributes->core.type,
attributes->core.bits, attributes->core.bits,
key_buffer, key_buffer,
key_buffer_size, key_buffer_size,
&ecp ); &ecp );
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
return( status ); return( status );
mbedtls_ecp_keypair *their_key = NULL; mbedtls_ecp_keypair *their_key = NULL;
@ -523,7 +524,6 @@ psa_status_t mbedtls_psa_key_agreement_ecdh(
goto exit; goto exit;
if( PSA_BITS_TO_BYTES( bits ) != *shared_secret_length ) if( PSA_BITS_TO_BYTES( bits ) != *shared_secret_length )
status = PSA_ERROR_CORRUPTION_DETECTED; status = PSA_ERROR_CORRUPTION_DETECTED;
exit: exit:
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
mbedtls_platform_zeroize( shared_secret, shared_secret_size ); mbedtls_platform_zeroize( shared_secret, shared_secret_size );

View File

@ -29,7 +29,6 @@
#include "test/drivers/test_driver.h" #include "test/drivers/test_driver.h"
#include <string.h> #include <string.h>
#include <stdio.h>
#if defined(MBEDTLS_TEST_LIBTESTDRIVER1) #if defined(MBEDTLS_TEST_LIBTESTDRIVER1)
#include "libtestdriver1/include/psa/crypto.h" #include "libtestdriver1/include/psa/crypto.h"
@ -50,7 +49,7 @@ psa_status_t mbedtls_test_transparent_key_agreement(
size_t shared_secret_size, size_t shared_secret_size,
size_t *shared_secret_length ) size_t *shared_secret_length )
{ {
++mbedtls_test_driver_key_agreement_hooks.hits; mbedtls_test_driver_key_agreement_hooks.hits++;
if( mbedtls_test_driver_key_agreement_hooks.forced_status != PSA_SUCCESS ) if( mbedtls_test_driver_key_agreement_hooks.forced_status != PSA_SUCCESS )
return( mbedtls_test_driver_key_agreement_hooks.forced_status ); return( mbedtls_test_driver_key_agreement_hooks.forced_status );

View File

@ -1,6 +1,5 @@
/* BEGIN_HEADER */ /* BEGIN_HEADER */
#include "test/drivers/test_driver.h" #include "test/drivers/test_driver.h"
#include <stdio.h>
#if defined(PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY) #if defined(PSA_WANT_KEY_TYPE_RSA_PUBLIC_KEY)
/* Sanity checks on the output of RSA encryption. /* Sanity checks on the output of RSA encryption.