Fix tests in test_suite_psa_crypto to set policy usage

This commit is contained in:
Moran Peker 2018-07-05 15:22:45 +03:00 committed by itayzafrir
parent 3286d46dcc
commit ed34695e08

View file

@ -1041,6 +1041,7 @@ void cipher_encrypt( int alg_arg, int key_type_arg,
size_t function_output_length = 0; size_t function_output_length = 0;
size_t total_output_length = 0; size_t total_output_length = 0;
psa_cipher_operation_t operation; psa_cipher_operation_t operation;
psa_key_policy_t policy;
TEST_ASSERT( key != NULL ); TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL ); TEST_ASSERT( input != NULL );
@ -1054,6 +1055,10 @@ void cipher_encrypt( int alg_arg, int key_type_arg,
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS ); TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_ENCRYPT, alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type, TEST_ASSERT( psa_import_key( key_slot, key_type,
key->x, key->len ) == PSA_SUCCESS ); key->x, key->len ) == PSA_SUCCESS );
@ -1111,6 +1116,7 @@ void cipher_encrypt_multipart( int alg_arg, int key_type_arg,
size_t function_output_length = 0; size_t function_output_length = 0;
size_t total_output_length = 0; size_t total_output_length = 0;
psa_cipher_operation_t operation; psa_cipher_operation_t operation;
psa_key_policy_t policy;
TEST_ASSERT( key != NULL ); TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL ); TEST_ASSERT( input != NULL );
@ -1124,6 +1130,10 @@ void cipher_encrypt_multipart( int alg_arg, int key_type_arg,
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS ); TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_ENCRYPT, alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type, TEST_ASSERT( psa_import_key( key_slot, key_type,
key->x, key->len ) == PSA_SUCCESS ); key->x, key->len ) == PSA_SUCCESS );
@ -1184,6 +1194,7 @@ void cipher_decrypt_multipart( int alg_arg, int key_type_arg,
size_t function_output_length = 0; size_t function_output_length = 0;
size_t total_output_length = 0; size_t total_output_length = 0;
psa_cipher_operation_t operation; psa_cipher_operation_t operation;
psa_key_policy_t policy;
TEST_ASSERT( key != NULL ); TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL ); TEST_ASSERT( input != NULL );
@ -1197,6 +1208,10 @@ void cipher_decrypt_multipart( int alg_arg, int key_type_arg,
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS ); TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_DECRYPT, alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type, TEST_ASSERT( psa_import_key( key_slot, key_type,
key->x, key->len ) == PSA_SUCCESS ); key->x, key->len ) == PSA_SUCCESS );
@ -1259,6 +1274,7 @@ void cipher_decrypt( int alg_arg, int key_type_arg,
size_t function_output_length = 0; size_t function_output_length = 0;
size_t total_output_length = 0; size_t total_output_length = 0;
psa_cipher_operation_t operation; psa_cipher_operation_t operation;
psa_key_policy_t policy;
TEST_ASSERT( key != NULL ); TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL ); TEST_ASSERT( input != NULL );
@ -1272,6 +1288,10 @@ void cipher_decrypt( int alg_arg, int key_type_arg,
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS ); TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_DECRYPT, alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type, TEST_ASSERT( psa_import_key( key_slot, key_type,
key->x, key->len ) == PSA_SUCCESS ); key->x, key->len ) == PSA_SUCCESS );
@ -1333,6 +1353,7 @@ void cipher_verify_output( int alg_arg, int key_type_arg,
size_t function_output_length = 0; size_t function_output_length = 0;
psa_cipher_operation_t operation1; psa_cipher_operation_t operation1;
psa_cipher_operation_t operation2; psa_cipher_operation_t operation2;
psa_key_policy_t policy;
TEST_ASSERT( key != NULL ); TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL ); TEST_ASSERT( input != NULL );
@ -1341,6 +1362,10 @@ void cipher_verify_output( int alg_arg, int key_type_arg,
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS ); TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_DECRYPT, alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type, TEST_ASSERT( psa_import_key( key_slot, key_type,
key->x, key->len ) == PSA_SUCCESS ); key->x, key->len ) == PSA_SUCCESS );
@ -1420,6 +1445,7 @@ void cipher_verify_output_multipart( int alg_arg,
size_t function_output_length; size_t function_output_length;
psa_cipher_operation_t operation1; psa_cipher_operation_t operation1;
psa_cipher_operation_t operation2; psa_cipher_operation_t operation2;
psa_key_policy_t policy;
TEST_ASSERT( key != NULL ); TEST_ASSERT( key != NULL );
TEST_ASSERT( input != NULL ); TEST_ASSERT( input != NULL );
@ -1428,6 +1454,10 @@ void cipher_verify_output_multipart( int alg_arg,
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS ); TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
psa_key_policy_init( &policy );
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_ENCRYPT | PSA_KEY_USAGE_DECRYPT, alg );
TEST_ASSERT( psa_set_key_policy( key_slot, &policy ) == PSA_SUCCESS );
TEST_ASSERT( psa_import_key( key_slot, key_type, TEST_ASSERT( psa_import_key( key_slot, key_type,
key->x, key->len ) == PSA_SUCCESS ); key->x, key->len ) == PSA_SUCCESS );