eden-emu/mbedtls
15
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

key_storage_read: pass exercise as a flag rather than a boolean

Browse source 
This will allow adding other flags in the future.

No intended behavior change.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2021-04-21 20:11:33 +02:00
parent 0225d3a0ce
commit 45f1cd7834
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/scripts/generate_psa_tests.py
View file

@ -276,13 +276,17 @@ class StorageFormat:
if self.forward: if self.forward:
extra_arguments = [] extra_arguments = []
else: else:
flags = []
# Some test keys have the RAW_DATA type and attributes that don't # Some test keys have the RAW_DATA type and attributes that don't
# necessarily make sense. We do this to validate numerical # necessarily make sense. We do this to validate numerical
# encodings of the attributes. # encodings of the attributes.
# Raw data keys have no useful exercise anyway so there is no # Raw data keys have no useful exercise anyway so there is no
# loss of test coverage. # loss of test coverage.
exercise = key.type.string != 'PSA_KEY_TYPE_RAW_DATA' if key.type.string != 'PSA_KEY_TYPE_RAW_DATA':
extra_arguments = ['1' if exercise else '0'] flags.append('TEST_FLAG_EXERCISE')
if 'READ_ONLY' in key.lifetime.string:
flags.append('TEST_FLAG_READ_ONLY')
extra_arguments = [' | '.join(flags) if flags else '0']
tc.set_arguments([key.lifetime.string, tc.set_arguments([key.lifetime.string,
key.type.string, str(key.bits), key.type.string, str(key.bits),
key.usage.string, key.alg.string, key.alg2.string, key.usage.string, key.alg.string, key.alg2.string,

10
tests/suites/test_suite_psa_crypto_storage_format.function
View file

@ -7,6 +7,8 @@
#include <psa_crypto_its.h> #include <psa_crypto_its.h>
#define TEST_FLAG_EXERCISE 0x00000001
/** Write a key with the given attributes and key material to storage. /** Write a key with the given attributes and key material to storage.
* Test that it has the expected representation. * Test that it has the expected representation.
* *
@ -67,7 +69,7 @@ static int test_read_key( const psa_key_attributes_t *expected_attributes,
const data_t *expected_material, const data_t *expected_material,
psa_storage_uid_t uid, psa_storage_uid_t uid,
const data_t *representation, const data_t *representation,
int exercise ) int flags )
{ {
psa_key_attributes_t actual_attributes = PSA_KEY_ATTRIBUTES_INIT; psa_key_attributes_t actual_attributes = PSA_KEY_ATTRIBUTES_INIT;
mbedtls_svc_key_id_t key_id = psa_get_key_id( expected_attributes ); mbedtls_svc_key_id_t key_id = psa_get_key_id( expected_attributes );
@ -105,7 +107,7 @@ static int test_read_key( const psa_key_attributes_t *expected_attributes,
exported_material, length ); exported_material, length );
} }
if( exercise ) if( flags & TEST_FLAG_EXERCISE )
{ {
TEST_ASSERT( mbedtls_test_psa_exercise_key( TEST_ASSERT( mbedtls_test_psa_exercise_key(
key_id, key_id,
@ -183,7 +185,7 @@ exit:
void key_storage_read( int lifetime_arg, int type_arg, int bits_arg, void key_storage_read( int lifetime_arg, int type_arg, int bits_arg,
int usage_arg, int alg_arg, int alg2_arg, int usage_arg, int alg_arg, int alg2_arg,
data_t *material, data_t *material,
data_t *representation, int exercise ) data_t *representation, int flags )
{ {
/* Backward compatibility: read a key in the format of a past version /* Backward compatibility: read a key in the format of a past version
* and check that this version can use it. */ * and check that this version can use it. */
@ -213,7 +215,7 @@ void key_storage_read( int lifetime_arg, int type_arg, int bits_arg,
* guarantees backward compatibility with keys that were stored by * guarantees backward compatibility with keys that were stored by
* past versions of Mbed TLS. */ * past versions of Mbed TLS. */
TEST_ASSERT( test_read_key( &attributes, material, TEST_ASSERT( test_read_key( &attributes, material,
uid, representation, exercise ) ); uid, representation, flags ) );
exit: exit:
psa_reset_key_attributes( &attributes ); psa_reset_key_attributes( &attributes );