yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-23 10:05:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Indent PSA tests according to K&R rules with Mbed TLS tweaks

Browse Source 
Only whitespace changes in this commit.
This commit is contained in:
Gilles Peskine 2018-12-17 23:35:42 +01:00
parent 9d8eea7e19
commit 0f915f1d2a
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
tests/suites/test_suite_psa_crypto.function
View File

@ -617,7 +617,7 @@ static int exported_key_sanity_check( psa_key_type_t type, size_t bits,
if( ! asn1_skip_integer( &p, end, 1, bits / 2 + 1, 0 ) ) if( ! asn1_skip_integer( &p, end, 1, bits / 2 + 1, 0 ) )
goto exit; goto exit;
TEST_ASSERT( p == end ); TEST_ASSERT( p == end );
} }
else else
#endif /* MBEDTLS_RSA_C */ #endif /* MBEDTLS_RSA_C */
@ -1210,7 +1210,7 @@ void export_after_import_failure( data_t *data, int type_arg,
/* Import the key - expect failure */ /* Import the key - expect failure */
status = psa_import_key( handle, type, status = psa_import_key( handle, type,
data->x, data->len ); data->x, data->len );
TEST_ASSERT( status == expected_import_status ); TEST_ASSERT( status == expected_import_status );
/* Export the key */ /* Export the key */
@ -1242,7 +1242,7 @@ void cipher_after_import_failure( data_t *data, int type_arg,
/* Import the key - expect failure */ /* Import the key - expect failure */
status = psa_import_key( handle, type, status = psa_import_key( handle, type,
data->x, data->len ); data->x, data->len );
TEST_ASSERT( status == expected_import_status ); TEST_ASSERT( status == expected_import_status );
status = psa_cipher_encrypt_setup( &operation, handle, exercise_alg ); status = psa_cipher_encrypt_setup( &operation, handle, exercise_alg );
@ -1832,19 +1832,19 @@ void hash_bad_order( )
memset( &operation, 0, sizeof( operation ) ); memset( &operation, 0, sizeof( operation ) );
TEST_ASSERT( psa_hash_update( &operation, TEST_ASSERT( psa_hash_update( &operation,
input, sizeof( input ) ) == input, sizeof( input ) ) ==
PSA_ERROR_INVALID_ARGUMENT ); PSA_ERROR_INVALID_ARGUMENT );
/* psa_hash_verify without calling psa_hash_setup beforehand */ /* psa_hash_verify without calling psa_hash_setup beforehand */
memset( &operation, 0, sizeof( operation ) ); memset( &operation, 0, sizeof( operation ) );
TEST_ASSERT( psa_hash_verify( &operation, TEST_ASSERT( psa_hash_verify( &operation,
hash, sizeof( hash ) ) == hash, sizeof( hash ) ) ==
PSA_ERROR_INVALID_ARGUMENT ); PSA_ERROR_INVALID_ARGUMENT );
/* psa_hash_finish without calling psa_hash_setup beforehand */ /* psa_hash_finish without calling psa_hash_setup beforehand */
memset( &operation, 0, sizeof( operation ) ); memset( &operation, 0, sizeof( operation ) );
TEST_ASSERT( psa_hash_finish( &operation, TEST_ASSERT( psa_hash_finish( &operation,
hash, sizeof( hash ), &hash_len ) == hash, sizeof( hash ), &hash_len ) ==
PSA_ERROR_INVALID_ARGUMENT ); PSA_ERROR_INVALID_ARGUMENT );
exit: exit:
mbedtls_psa_crypto_free( ); mbedtls_psa_crypto_free( );
@ -1870,19 +1870,19 @@ void hash_verify_bad_args( )
TEST_ASSERT( psa_hash_setup( &operation, alg ) == PSA_SUCCESS ); TEST_ASSERT( psa_hash_setup( &operation, alg ) == PSA_SUCCESS );
TEST_ASSERT( psa_hash_verify( &operation, TEST_ASSERT( psa_hash_verify( &operation,
hash, expected_size - 1 ) == hash, expected_size - 1 ) ==
PSA_ERROR_INVALID_SIGNATURE ); PSA_ERROR_INVALID_SIGNATURE );
/* psa_hash_verify with a non-matching hash */ /* psa_hash_verify with a non-matching hash */
TEST_ASSERT( psa_hash_setup( &operation, alg ) == PSA_SUCCESS ); TEST_ASSERT( psa_hash_setup( &operation, alg ) == PSA_SUCCESS );
TEST_ASSERT( psa_hash_verify( &operation, TEST_ASSERT( psa_hash_verify( &operation,
hash + 1, expected_size ) == hash + 1, expected_size ) ==
PSA_ERROR_INVALID_SIGNATURE ); PSA_ERROR_INVALID_SIGNATURE );
/* psa_hash_verify with a hash longer than expected */ /* psa_hash_verify with a hash longer than expected */
TEST_ASSERT( psa_hash_setup( &operation, alg ) == PSA_SUCCESS ); TEST_ASSERT( psa_hash_setup( &operation, alg ) == PSA_SUCCESS );
TEST_ASSERT( psa_hash_verify( &operation, TEST_ASSERT( psa_hash_verify( &operation,
hash, sizeof( hash ) ) == hash, sizeof( hash ) ) ==
PSA_ERROR_INVALID_SIGNATURE ); PSA_ERROR_INVALID_SIGNATURE );
exit: exit:
mbedtls_psa_crypto_free( ); mbedtls_psa_crypto_free( );
@ -4143,7 +4143,7 @@ void persistent_key_load_key_from_storage( data_t *data, int type_arg,
psa_key_policy_set_usage( &base_policy_set, PSA_KEY_USAGE_DERIVE, psa_key_policy_set_usage( &base_policy_set, PSA_KEY_USAGE_DERIVE,
base_policy_alg ); base_policy_alg );
TEST_ASSERT( psa_set_key_policy( TEST_ASSERT( psa_set_key_policy(
base_key, &base_policy_set ) == PSA_SUCCESS ); base_key, &base_policy_set ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( base_key, PSA_KEY_TYPE_DERIVE, TEST_ASSERT( psa_import_key( base_key, PSA_KEY_TYPE_DERIVE,
data->x, data->len ) == PSA_SUCCESS ); data->x, data->len ) == PSA_SUCCESS );
/* Derive a key. */ /* Derive a key. */
@ -4152,8 +4152,8 @@ void persistent_key_load_key_from_storage( data_t *data, int type_arg,
NULL, 0, NULL, 0, NULL, 0, NULL, 0,
export_size ) == PSA_SUCCESS ); export_size ) == PSA_SUCCESS );
TEST_ASSERT( psa_generator_import_key( TEST_ASSERT( psa_generator_import_key(
handle, PSA_KEY_TYPE_RAW_DATA, handle, PSA_KEY_TYPE_RAW_DATA,
bits, &generator ) == PSA_SUCCESS ); bits, &generator ) == PSA_SUCCESS );
break; break;
} }
@ -4169,15 +4169,15 @@ void persistent_key_load_key_from_storage( data_t *data, int type_arg,
TEST_ASSERT( psa_open_key( PSA_KEY_LIFETIME_PERSISTENT, 1, TEST_ASSERT( psa_open_key( PSA_KEY_LIFETIME_PERSISTENT, 1,
&handle ) == PSA_SUCCESS ); &handle ) == PSA_SUCCESS );
TEST_ASSERT( psa_get_key_information( TEST_ASSERT( psa_get_key_information(
handle, &type_get, &bits_get ) == PSA_SUCCESS ); handle, &type_get, &bits_get ) == PSA_SUCCESS );
TEST_ASSERT( type_get == type ); TEST_ASSERT( type_get == type );
TEST_ASSERT( bits_get == (size_t) bits ); TEST_ASSERT( bits_get == (size_t) bits );
TEST_ASSERT( psa_get_key_policy( handle, &policy_get ) == PSA_SUCCESS ); TEST_ASSERT( psa_get_key_policy( handle, &policy_get ) == PSA_SUCCESS );
TEST_ASSERT( psa_key_policy_get_usage( TEST_ASSERT( psa_key_policy_get_usage(
&policy_get ) == policy_usage ); &policy_get ) == policy_usage );
TEST_ASSERT( psa_key_policy_get_algorithm( TEST_ASSERT( psa_key_policy_get_algorithm(
&policy_get ) == policy_alg ); &policy_get ) == policy_alg );
/* Export the key again */ /* Export the key again */
TEST_ASSERT( psa_export_key( handle, second_export, export_size, TEST_ASSERT( psa_export_key( handle, second_export, export_size,

4
tests/suites/test_suite_psa_crypto_hash.function
View File

@ -15,7 +15,7 @@
* END_DEPENDENCIES * END_DEPENDENCIES
*/ */
/* BEGIN_CASE */ /* BEGIN_CASE */
void hash_finish( int alg_arg, data_t *input, data_t *expected_hash ) void hash_finish( int alg_arg, data_t *input, data_t *expected_hash )
{ {
psa_algorithm_t alg = alg_arg; psa_algorithm_t alg = alg_arg;
@ -80,7 +80,7 @@ void hash_multi_part( int alg_arg, data_t *input, data_t *expected_hash )
input->x, len ) == PSA_SUCCESS ); input->x, len ) == PSA_SUCCESS );
TEST_ASSERT( psa_hash_update( &operation, TEST_ASSERT( psa_hash_update( &operation,
input->x + len, input->len - len ) == input->x + len, input->len - len ) ==
PSA_SUCCESS ); PSA_SUCCESS );
TEST_ASSERT( psa_hash_finish( &operation, TEST_ASSERT( psa_hash_finish( &operation,
actual_hash, sizeof( actual_hash ), actual_hash, sizeof( actual_hash ),

2
tests/suites/test_suite_psa_crypto_metadata.function
View File

@ -46,7 +46,7 @@
#define KEY_TYPE_IS_DSA ( 1u << 5 ) #define KEY_TYPE_IS_DSA ( 1u << 5 )
#define KEY_TYPE_IS_ECC ( 1u << 6 ) #define KEY_TYPE_IS_ECC ( 1u << 6 )
#define TEST_CLASSIFICATION_MACRO( flag, alg, flags ) \ #define TEST_CLASSIFICATION_MACRO( flag, alg, flags ) \
TEST_ASSERT( PSA_##flag( alg ) == !! ( ( flags ) & flag ) ) TEST_ASSERT( PSA_##flag( alg ) == !! ( ( flags ) & flag ) )
void algorithm_classification( psa_algorithm_t alg, unsigned flags ) void algorithm_classification( psa_algorithm_t alg, unsigned flags )

12
tests/suites/test_suite_psa_crypto_persistent_key.function
View File

@ -103,7 +103,7 @@ void save_large_persistent_key( int data_too_large, int expected_status )
&handle ) == PSA_SUCCESS ); &handle ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( handle, PSA_KEY_TYPE_RAW_DATA, TEST_ASSERT( psa_import_key( handle, PSA_KEY_TYPE_RAW_DATA,
data, data_length ) == expected_status ); data, data_length ) == expected_status );
exit: exit:
mbedtls_free( data ); mbedtls_free( data );
@ -135,8 +135,8 @@ void persistent_key_destroy( int key_id_arg, int should_store,
if( should_store == 1 ) if( should_store == 1 )
{ {
TEST_ASSERT( psa_import_key( TEST_ASSERT( psa_import_key(
handle, first_type, handle, first_type,
first_data->x, first_data->len ) == PSA_SUCCESS ); first_data->x, first_data->len ) == PSA_SUCCESS );
} }
/* Destroy the key */ /* Destroy the key */
@ -158,8 +158,8 @@ void persistent_key_destroy( int key_id_arg, int should_store,
PSA_BYTES_TO_BITS( second_data->len ), PSA_BYTES_TO_BITS( second_data->len ),
&handle ) == PSA_SUCCESS ); &handle ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( TEST_ASSERT( psa_import_key(
handle, second_type, handle, second_type,
second_data->x, second_data->len ) == PSA_SUCCESS ); second_data->x, second_data->len ) == PSA_SUCCESS );
exit: exit:
mbedtls_psa_crypto_free(); mbedtls_psa_crypto_free();
@ -240,7 +240,7 @@ void import_export_persistent_key( data_t *data, int type_arg,
/* Test the key information */ /* Test the key information */
TEST_ASSERT( psa_get_key_information( TEST_ASSERT( psa_get_key_information(
handle, &got_type, &got_bits ) == PSA_SUCCESS ); handle, &got_type, &got_bits ) == PSA_SUCCESS );
TEST_ASSERT( got_type == type ); TEST_ASSERT( got_type == type );
TEST_ASSERT( got_bits == (size_t) expected_bits ); TEST_ASSERT( got_bits == (size_t) expected_bits );