Skip to content

Commit 40ab95b

Browse files
gilles-peskine-armgilles-peskine-arm
committed
Remove checks of test parameters against SIZE_MAX
Our code base doesn't even support 16-bit platforms, so those checks are always trivially true.
1 parent 0dfba2d commit 40ab95b

File tree

1 file changed

+0
-59
lines changed

1 file changed

+0
-59
lines changed

‎tests/suites/test_suite_psa_crypto.function

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313

1414
#define MAX( x, y ) ( ( x ) > ( y ) ? ( x ) : ( y ) )
1515

16-
#if(UINT32_MAX > SIZE_MAX)
17-
#define PSA_CRYPTO_TEST_SIZE_T_RANGE( x ) ( ( x ) <= SIZE_MAX )
18-
#else
19-
#define PSA_CRYPTO_TEST_SIZE_T_RANGE( x ) 1
20-
#endif
21-
2216
/** An invalid export length that will never be set by psa_export_key(). */
2317
static const size_t INVALID_EXPORT_LENGTH = ~0U;
2418

@@ -884,7 +878,6 @@ void import( data_t *data, int type, int expected_status_arg )
884878
psa_status_t status;
885879

886880
TEST_ASSERT( data != NULL );
887-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( data->len ) );
888881
PSA_ASSERT( psa_crypto_init( ) );
889882

890883
PSA_ASSERT( psa_allocate_key( type, KEY_BITS_FROM_DATA( type, data ),
@@ -1003,7 +996,6 @@ void import_export( data_t *data,
1003996
psa_key_policy_t policy;
1004997

1005998
TEST_ASSERT( data != NULL );
1006-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( data->len ) );
1007999
export_size = (ptrdiff_t) data->len + export_size_delta;
10081000
ASSERT_ALLOC( exported, export_size );
10091001
if( ! canonical_input )
@@ -2016,9 +2008,6 @@ void mac_verify( int key_type_arg,
20162008
TEST_ASSERT( key != NULL );
20172009
TEST_ASSERT( input != NULL );
20182010
TEST_ASSERT( expected_mac != NULL );
2019-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key->len ) );
2020-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
2021-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_mac->len ) );
20222011

20232012
PSA_ASSERT( psa_crypto_init( ) );
20242013

@@ -2104,9 +2093,6 @@ void cipher_encrypt( int alg_arg, int key_type_arg,
21042093
TEST_ASSERT( key != NULL );
21052094
TEST_ASSERT( input != NULL );
21062095
TEST_ASSERT( expected_output != NULL );
2107-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key->len ) );
2108-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
2109-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_output->len ) );
21102096

21112097
iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
21122098
memset( iv, 0x2a, iv_size );
@@ -2179,9 +2165,6 @@ void cipher_encrypt_multipart( int alg_arg, int key_type_arg,
21792165
TEST_ASSERT( key != NULL );
21802166
TEST_ASSERT( input != NULL );
21812167
TEST_ASSERT( expected_output != NULL );
2182-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key->len ) );
2183-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
2184-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_output->len ) );
21852168

21862169
iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
21872170
memset( iv, 0x2a, iv_size );
@@ -2257,9 +2240,6 @@ void cipher_decrypt_multipart( int alg_arg, int key_type_arg,
22572240
TEST_ASSERT( key != NULL );
22582241
TEST_ASSERT( input != NULL );
22592242
TEST_ASSERT( expected_output != NULL );
2260-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key->len ) );
2261-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
2262-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_output->len ) );
22632243

22642244
iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
22652245
memset( iv, 0x2a, iv_size );
@@ -2337,9 +2317,6 @@ void cipher_decrypt( int alg_arg, int key_type_arg,
23372317
TEST_ASSERT( key != NULL );
23382318
TEST_ASSERT( input != NULL );
23392319
TEST_ASSERT( expected_output != NULL );
2340-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key->len ) );
2341-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
2342-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_output->len ) );
23432320

23442321
iv_size = PSA_BLOCK_CIPHER_BLOCK_SIZE( key_type );
23452322
memset( iv, 0x2a, iv_size );
@@ -2415,8 +2392,6 @@ void cipher_verify_output( int alg_arg, int key_type_arg,
24152392

24162393
TEST_ASSERT( key != NULL );
24172394
TEST_ASSERT( input != NULL );
2418-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key->len ) );
2419-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
24202395

24212396
PSA_ASSERT( psa_crypto_init( ) );
24222397

@@ -2506,8 +2481,6 @@ void cipher_verify_output_multipart( int alg_arg,
25062481

25072482
TEST_ASSERT( key != NULL );
25082483
TEST_ASSERT( input != NULL );
2509-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key->len ) );
2510-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input->len ) );
25112484

25122485
PSA_ASSERT( psa_crypto_init( ) );
25132486

@@ -2614,10 +2587,6 @@ void aead_encrypt_decrypt( int key_type_arg, data_t *key_data,
26142587
TEST_ASSERT( input_data != NULL );
26152588
TEST_ASSERT( nonce != NULL );
26162589
TEST_ASSERT( additional_data != NULL );
2617-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
2618-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
2619-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( nonce->len ) );
2620-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( additional_data->len ) );
26212590

26222591
output_size = input_data->len + tag_length;
26232592
ASSERT_ALLOC( output_data, output_size );
@@ -2691,11 +2660,6 @@ void aead_encrypt( int key_type_arg, data_t *key_data,
26912660
TEST_ASSERT( additional_data != NULL );
26922661
TEST_ASSERT( nonce != NULL );
26932662
TEST_ASSERT( expected_result != NULL );
2694-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
2695-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
2696-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( additional_data->len ) );
2697-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( nonce->len ) );
2698-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_result->len ) );
26992663

27002664
output_size = input_data->len + tag_length;
27012665
ASSERT_ALLOC( output_data, output_size );
@@ -2753,11 +2717,6 @@ void aead_decrypt( int key_type_arg, data_t *key_data,
27532717
TEST_ASSERT( additional_data != NULL );
27542718
TEST_ASSERT( nonce != NULL );
27552719
TEST_ASSERT( expected_data != NULL );
2756-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
2757-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
2758-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( additional_data->len ) );
2759-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( nonce->len ) );
2760-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_data->len ) );
27612720

27622721
output_size = input_data->len + tag_length;
27632722
ASSERT_ALLOC( output_data, output_size );
@@ -2826,9 +2785,6 @@ void sign_deterministic( int key_type_arg, data_t *key_data,
28262785
TEST_ASSERT( key_data != NULL );
28272786
TEST_ASSERT( input_data != NULL );
28282787
TEST_ASSERT( output_data != NULL );
2829-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
2830-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
2831-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( output_data->len ) );
28322788

28332789
PSA_ASSERT( psa_crypto_init( ) );
28342790

@@ -2887,8 +2843,6 @@ void sign_fail( int key_type_arg, data_t *key_data,
28872843

28882844
TEST_ASSERT( key_data != NULL );
28892845
TEST_ASSERT( input_data != NULL );
2890-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
2891-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
28922846

28932847
ASSERT_ALLOC( signature, signature_size );
28942848

@@ -3011,9 +2965,6 @@ void asymmetric_verify( int key_type_arg, data_t *key_data,
30112965
TEST_ASSERT( key_data != NULL );
30122966
TEST_ASSERT( hash_data != NULL );
30132967
TEST_ASSERT( signature_data != NULL );
3014-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
3015-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( hash_data->len ) );
3016-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( signature_data->len ) );
30172968

30182969
PSA_ASSERT( psa_crypto_init( ) );
30192970

@@ -3054,9 +3005,6 @@ void asymmetric_verify_fail( int key_type_arg, data_t *key_data,
30543005
TEST_ASSERT( key_data != NULL );
30553006
TEST_ASSERT( hash_data != NULL );
30563007
TEST_ASSERT( signature_data != NULL );
3057-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
3058-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( hash_data->len ) );
3059-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( signature_data->len ) );
30603008

30613009
PSA_ASSERT( psa_crypto_init( ) );
30623010

@@ -3178,8 +3126,6 @@ void asymmetric_encrypt_decrypt( int key_type_arg,
31783126

31793127
TEST_ASSERT( key_data != NULL );
31803128
TEST_ASSERT( input_data != NULL );
3181-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
3182-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
31833129

31843130
PSA_ASSERT( psa_crypto_init( ) );
31853131

@@ -3252,9 +3198,6 @@ void asymmetric_decrypt( int key_type_arg,
32523198
TEST_ASSERT( key_data != NULL );
32533199
TEST_ASSERT( input_data != NULL );
32543200
TEST_ASSERT( expected_data != NULL );
3255-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
3256-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
3257-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( expected_data->len ) );
32583201

32593202
output_size = key_data->len;
32603203
ASSERT_ALLOC( output, output_size );
@@ -3325,8 +3268,6 @@ void asymmetric_decrypt_fail( int key_type_arg,
33253268

33263269
TEST_ASSERT( key_data != NULL );
33273270
TEST_ASSERT( input_data != NULL );
3328-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( key_data->len ) );
3329-
TEST_ASSERT( PSA_CRYPTO_TEST_SIZE_T_RANGE( input_data->len ) );
33303271

33313272
output_size = key_data->len;
33323273
ASSERT_ALLOC( output, output_size );

0 commit comments

Comments
 (0)