AuroraMiddleware/mbedtls
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Whitespace fixes; removed redundant parentheses

Browse Source 
No semantic change.
This commit is contained in:
Gilles Peskine 2018-06-04 15:08:56 +02:00 committed by itayzafrir
parent c425e87af7
commit 785fd55a39
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/psa_crypto.c
View File

@ -473,9 +473,9 @@ static psa_status_t psa_internal_export_key(psa_key_slot_t key,
if( !( slot->policy.usage & PSA_KEY_USAGE_EXPORT ) ) if( !( slot->policy.usage & PSA_KEY_USAGE_EXPORT ) )
return( PSA_ERROR_NOT_PERMITTED ); return( PSA_ERROR_NOT_PERMITTED );
if( ( export_public_key ) && ( !( PSA_KEY_TYPE_IS_PUBLIC_KEY( slot->type ) if( export_public_key && !( PSA_KEY_TYPE_IS_PUBLIC_KEY( slot->type ) ||
|| PSA_KEY_TYPE_IS_KEYPAIR( slot->type ) ) ) ) PSA_KEY_TYPE_IS_KEYPAIR( slot->type ) ) )
return( PSA_ERROR_INVALID_ARGUMENT ); return( PSA_ERROR_INVALID_ARGUMENT );
if( PSA_KEY_TYPE_IS_RAW_BYTES( slot->type ) ) if( PSA_KEY_TYPE_IS_RAW_BYTES( slot->type ) )
@ -520,8 +520,8 @@ static psa_status_t psa_internal_export_key(psa_key_slot_t key,
#endif /* defined(MBEDTLS_PK_WRITE_C) */ #endif /* defined(MBEDTLS_PK_WRITE_C) */
{ {
/* This shouldn't happen in the reference implementation, but /* This shouldn't happen in the reference implementation, but
it is valid for a special-purpose implementation to omit it is valid for a special-purpose implementation to omit
support for exporting certain key types. */ support for exporting certain key types. */
return( PSA_ERROR_NOT_SUPPORTED ); return( PSA_ERROR_NOT_SUPPORTED );
} }
} }

3
tests/suites/test_suite_psa_crypto.function
View File

@ -557,7 +557,7 @@ void import_export_public_key( char *hex,
psa_key_policy_init( &policy ); psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_EXPORT, psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_EXPORT,
PSA_ALG_VENDOR_FLAG ); PSA_ALG_VENDOR_FLAG );
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS ); TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
@ -580,7 +580,6 @@ void import_export_public_key( char *hex,
if( status != PSA_SUCCESS ) if( status != PSA_SUCCESS )
goto destroy; goto destroy;
TEST_ASSERT( exported_length == (size_t) public_key_expected_length ); TEST_ASSERT( exported_length == (size_t) public_key_expected_length );
destroy: destroy: