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

Remove useless null checks of data_t* parameters

Browse Source 
The test framework never passes NULL for a data_t* parameter, so
testing them against NULL is clutter.
This commit is contained in:
Gilles Peskine 2018-12-18 00:48:27 +01:00
parent 40ab95bdbc
commit 1f2aa0e3b0
1 changed files with 0 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
tests/suites/test_suite_psa_crypto.function
View File

@ -877,7 +877,6 @@ void import( data_t *data, int type, int expected_status_arg )
psa_status_t expected_status = expected_status_arg; psa_status_t expected_status = expected_status_arg;
psa_status_t status; psa_status_t status;
TEST_ASSERT( data != NULL );
PSA_ASSERT( psa_crypto_init( ) ); PSA_ASSERT( psa_crypto_init( ) );
PSA_ASSERT( psa_allocate_key( type, KEY_BITS_FROM_DATA( type, data ), PSA_ASSERT( psa_allocate_key( type, KEY_BITS_FROM_DATA( type, data ),
@ -995,7 +994,6 @@ void import_export( data_t *data,
size_t got_bits; size_t got_bits;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( data != NULL );
export_size = (ptrdiff_t) data->len + export_size_delta; export_size = (ptrdiff_t) data->len + export_size_delta;
ASSERT_ALLOC( exported, export_size ); ASSERT_ALLOC( exported, export_size );
if( ! canonical_input ) if( ! canonical_input )
@ -2005,10 +2003,6 @@ void mac_verify( int key_type_arg,
TEST_ASSERT( expected_mac->len <= PSA_MAC_MAX_SIZE ); TEST_ASSERT( expected_mac->len <= PSA_MAC_MAX_SIZE );
TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL );
TEST_ASSERT( expected_mac != NULL );
PSA_ASSERT( psa_crypto_init( ) ); PSA_ASSERT( psa_crypto_init( ) );
PSA_ASSERT( psa_allocate_key( key_type, PSA_BYTES_TO_BITS( key->len ), PSA_ASSERT( psa_allocate_key( key_type, PSA_BYTES_TO_BITS( key->len ),
@ -2090,10 +2084,6 @@ void cipher_encrypt( int alg_arg, int key_type_arg,
psa_cipher_operation_t operation; psa_cipher_operation_t operation;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL );
TEST_ASSERT( expected_output != NULL );
iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type ); iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
memset( iv, 0x2a, iv_size ); memset( iv, 0x2a, iv_size );
@ -2162,10 +2152,6 @@ void cipher_encrypt_multipart( int alg_arg, int key_type_arg,
psa_cipher_operation_t operation; psa_cipher_operation_t operation;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL );
TEST_ASSERT( expected_output != NULL );
iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type ); iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
memset( iv, 0x2a, iv_size ); memset( iv, 0x2a, iv_size );
@ -2237,10 +2223,6 @@ void cipher_decrypt_multipart( int alg_arg, int key_type_arg,
psa_cipher_operation_t operation; psa_cipher_operation_t operation;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL );
TEST_ASSERT( expected_output != NULL );
iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type ); iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
memset( iv, 0x2a, iv_size ); memset( iv, 0x2a, iv_size );
@ -2314,10 +2296,6 @@ void cipher_decrypt( int alg_arg, int key_type_arg,
psa_cipher_operation_t operation; psa_cipher_operation_t operation;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL );
TEST_ASSERT( expected_output != NULL );
iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type ); iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
memset( iv, 0x2a, iv_size ); memset( iv, 0x2a, iv_size );
@ -2390,9 +2368,6 @@ void cipher_verify_output( int alg_arg, int key_type_arg,
psa_cipher_operation_t operation2; psa_cipher_operation_t operation2;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL );
PSA_ASSERT( psa_crypto_init( ) ); PSA_ASSERT( psa_crypto_init( ) );
PSA_ASSERT( psa_allocate_key( key_type, PSA_BYTES_TO_BITS( key->len ), PSA_ASSERT( psa_allocate_key( key_type, PSA_BYTES_TO_BITS( key->len ),
@ -2479,9 +2454,6 @@ void cipher_verify_output_multipart( int alg_arg,
psa_cipher_operation_t operation2; psa_cipher_operation_t operation2;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL );
PSA_ASSERT( psa_crypto_init( ) ); PSA_ASSERT( psa_crypto_init( ) );
PSA_ASSERT( psa_allocate_key( key_type, PSA_BYTES_TO_BITS( key->len ), PSA_ASSERT( psa_allocate_key( key_type, PSA_BYTES_TO_BITS( key->len ),
@ -2583,11 +2555,6 @@ void aead_encrypt_decrypt( int key_type_arg, data_t *key_data,
psa_status_t expected_result = expected_result_arg; psa_status_t expected_result = expected_result_arg;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
TEST_ASSERT( nonce != NULL );
TEST_ASSERT( additional_data != NULL );
output_size = input_data->len + tag_length; output_size = input_data->len + tag_length;
ASSERT_ALLOC( output_data, output_size ); ASSERT_ALLOC( output_data, output_size );
@ -2655,12 +2622,6 @@ void aead_encrypt( int key_type_arg, data_t *key_data,
size_t tag_length = 16; size_t tag_length = 16;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
TEST_ASSERT( additional_data != NULL );
TEST_ASSERT( nonce != NULL );
TEST_ASSERT( expected_result != NULL );
output_size = input_data->len + tag_length; output_size = input_data->len + tag_length;
ASSERT_ALLOC( output_data, output_size ); ASSERT_ALLOC( output_data, output_size );
@ -2712,12 +2673,6 @@ void aead_decrypt( int key_type_arg, data_t *key_data,
psa_key_policy_t policy; psa_key_policy_t policy;
psa_status_t expected_result = expected_result_arg; psa_status_t expected_result = expected_result_arg;
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
TEST_ASSERT( additional_data != NULL );
TEST_ASSERT( nonce != NULL );
TEST_ASSERT( expected_data != NULL );
output_size = input_data->len + tag_length; output_size = input_data->len + tag_length;
ASSERT_ALLOC( output_data, output_size ); ASSERT_ALLOC( output_data, output_size );
@ -2782,10 +2737,6 @@ void sign_deterministic( int key_type_arg, data_t *key_data,
size_t signature_length = 0xdeadbeef; size_t signature_length = 0xdeadbeef;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
TEST_ASSERT( output_data != NULL );
PSA_ASSERT( psa_crypto_init( ) ); PSA_ASSERT( psa_crypto_init( ) );
PSA_ASSERT( psa_allocate_key( key_type, PSA_ASSERT( psa_allocate_key( key_type,
@ -2841,9 +2792,6 @@ void sign_fail( int key_type_arg, data_t *key_data,
size_t signature_length = 0xdeadbeef; size_t signature_length = 0xdeadbeef;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
ASSERT_ALLOC( signature, signature_size ); ASSERT_ALLOC( signature, signature_size );
PSA_ASSERT( psa_crypto_init( ) ); PSA_ASSERT( psa_crypto_init( ) );
@ -2962,10 +2910,6 @@ void asymmetric_verify( int key_type_arg, data_t *key_data,
TEST_ASSERT( signature_data->len <= PSA_ASYMMETRIC_SIGNATURE_MAX_SIZE ); TEST_ASSERT( signature_data->len <= PSA_ASYMMETRIC_SIGNATURE_MAX_SIZE );
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( hash_data != NULL );
TEST_ASSERT( signature_data != NULL );
PSA_ASSERT( psa_crypto_init( ) ); PSA_ASSERT( psa_crypto_init( ) );
PSA_ASSERT( psa_allocate_key( key_type, PSA_ASSERT( psa_allocate_key( key_type,
@ -3002,10 +2946,6 @@ void asymmetric_verify_fail( int key_type_arg, data_t *key_data,
psa_status_t expected_status = expected_status_arg; psa_status_t expected_status = expected_status_arg;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( hash_data != NULL );
TEST_ASSERT( signature_data != NULL );
PSA_ASSERT( psa_crypto_init( ) ); PSA_ASSERT( psa_crypto_init( ) );
PSA_ASSERT( psa_allocate_key( key_type, PSA_ASSERT( psa_allocate_key( key_type,
@ -3124,9 +3064,6 @@ void asymmetric_encrypt_decrypt( int key_type_arg,
size_t output2_length = ~0; size_t output2_length = ~0;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
PSA_ASSERT( psa_crypto_init( ) ); PSA_ASSERT( psa_crypto_init( ) );
PSA_ASSERT( psa_allocate_key( key_type, PSA_ASSERT( psa_allocate_key( key_type,
@ -3195,10 +3132,6 @@ void asymmetric_decrypt( int key_type_arg,
size_t output_length = ~0; size_t output_length = ~0;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
TEST_ASSERT( expected_data != NULL );
output_size = key_data->len; output_size = key_data->len;
ASSERT_ALLOC( output, output_size ); ASSERT_ALLOC( output, output_size );
@ -3266,9 +3199,6 @@ void asymmetric_decrypt_fail( int key_type_arg,
psa_status_t expected_status = expected_status_arg; psa_status_t expected_status = expected_status_arg;
psa_key_policy_t policy; psa_key_policy_t policy;
TEST_ASSERT( key_data != NULL );
TEST_ASSERT( input_data != NULL );
output_size = key_data->len; output_size = key_data->len;
ASSERT_ALLOC( output, output_size ); ASSERT_ALLOC( output, output_size );