mirror of
https://github.com/yuzu-emu/mbedtls.git
synced 2024-12-23 23:45:34 +00:00
Convert the PSA crypto persistent storage tests to the new handle API
Switch from the direct use of slot numbers to handles allocated by psa_allocate_key. The general principle for each function is: * Change `psa_key_slot_t slot` to `psa_key_handle_t handle` or `psa_key_id_t key_id` depending on whether it's used as a handle to an open slot or as a persistent name for a key. * Call psa_create_key() before using a slot, instead of calling psa_set_key_lifetime to make a slot persistent. Remove the unit test persistent_key_is_configurable which is no longer relevant.
This commit is contained in:
Gilles Peskine
parent
a23eafce3a
commit
7bc9f68232
|
|
@ -24,10 +24,6 @@ save_large_persistent_key:0:PSA_SUCCESS
|
|||
Save larger than maximum size persistent raw key, should fail
|
||||
save_large_persistent_key:1:PSA_ERROR_INSUFFICIENT_STORAGE
|
||||
|
||||
Persistent key is configurable
|
||||
depends_on:MBEDTLS_PK_C:MBEDTLS_PK_PARSE_C:MBEDTLS_RSA_C
|
||||
persistent_key_is_configurable:1:PSA_KEY_TYPE_RSA_KEYPAIR:"3082025e02010002818100af057d396ee84fb75fdbb5c2b13c7fe5a654aa8aa2470b541ee1feb0b12d25c79711531249e1129628042dbbb6c120d1443524ef4c0e6e1d8956eeb2077af12349ddeee54483bc06c2c61948cd02b202e796aebd94d3a7cbf859c2c1819c324cb82b9cd34ede263a2abffe4733f077869e8660f7d6834da53d690ef7985f6bc3020301000102818100874bf0ffc2f2a71d14671ddd0171c954d7fdbf50281e4f6d99ea0e1ebcf82faa58e7b595ffb293d1abe17f110b37c48cc0f36c37e84d876621d327f64bbe08457d3ec4098ba2fa0a319fba411c2841ed7be83196a8cdf9daa5d00694bc335fc4c32217fe0488bce9cb7202e59468b1ead119000477db2ca797fac19eda3f58c1024100e2ab760841bb9d30a81d222de1eb7381d82214407f1b975cbbfe4e1a9467fd98adbd78f607836ca5be1928b9d160d97fd45c12d6b52e2c9871a174c66b488113024100c5ab27602159ae7d6f20c3c2ee851e46dc112e689e28d5fcbbf990a99ef8a90b8bb44fd36467e7fc1789ceb663abda338652c3c73f111774902e840565927091024100b6cdbd354f7df579a63b48b3643e353b84898777b48b15f94e0bfc0567a6ae5911d57ad6409cf7647bf96264e9bd87eb95e263b7110b9a1f9f94acced0fafa4d024071195eec37e8d257decfc672b07ae639f10cbb9b0c739d0c809968d644a94e3fd6ed9287077a14583f379058f76a8aecd43c62dc8c0f41766650d725275ac4a1024100bb32d133edc2e048d463388b7be9cb4be29f4b6250be603e70e3647501c97ddde20a4e71be95fd5e71784e25aca4baf25be5738aae59bbfe1c997781447a2b24"
|
||||
|
||||
Persistent key destroy
|
||||
depends_on:MBEDTLS_PK_C:MBEDTLS_PK_PARSE_C:MBEDTLS_RSA_C
|
||||
persistent_key_destroy:1:1:PSA_KEY_TYPE_RSA_KEYPAIR:"3082025e02010002818100af057d396ee84fb75fdbb5c2b13c7fe5a654aa8aa2470b541ee1feb0b12d25c79711531249e1129628042dbbb6c120d1443524ef4c0e6e1d8956eeb2077af12349ddeee54483bc06c2c61948cd02b202e796aebd94d3a7cbf859c2c1819c324cb82b9cd34ede263a2abffe4733f077869e8660f7d6834da53d690ef7985f6bc3020301000102818100874bf0ffc2f2a71d14671ddd0171c954d7fdbf50281e4f6d99ea0e1ebcf82faa58e7b595ffb293d1abe17f110b37c48cc0f36c37e84d876621d327f64bbe08457d3ec4098ba2fa0a319fba411c2841ed7be83196a8cdf9daa5d00694bc335fc4c32217fe0488bce9cb7202e59468b1ead119000477db2ca797fac19eda3f58c1024100e2ab760841bb9d30a81d222de1eb7381d82214407f1b975cbbfe4e1a9467fd98adbd78f607836ca5be1928b9d160d97fd45c12d6b52e2c9871a174c66b488113024100c5ab27602159ae7d6f20c3c2ee851e46dc112e689e28d5fcbbf990a99ef8a90b8bb44fd36467e7fc1789ceb663abda338652c3c73f111774902e840565927091024100b6cdbd354f7df579a63b48b3643e353b84898777b48b15f94e0bfc0567a6ae5911d57ad6409cf7647bf96264e9bd87eb95e263b7110b9a1f9f94acced0fafa4d024071195eec37e8d257decfc672b07ae639f10cbb9b0c739d0c809968d644a94e3fd6ed9287077a14583f379058f76a8aecd43c62dc8c0f41766650d725275ac4a1024100bb32d133edc2e048d463388b7be9cb4be29f4b6250be603e70e3647501c97ddde20a4e71be95fd5e71784e25aca4baf25be5738aae59bbfe1c997781447a2b24":PSA_KEY_TYPE_RAW_DATA:"deadbeef"
|
||||
|
|
@ -36,10 +32,6 @@ Persistent key destroy missing key
|
|||
depends_on:MBEDTLS_PK_C:MBEDTLS_PK_PARSE_C:MBEDTLS_RSA_C
|
||||
persistent_key_destroy:1:0:PSA_KEY_TYPE_RSA_KEYPAIR:"":PSA_KEY_TYPE_RAW_DATA:"deadbeef"
|
||||
|
||||
Key lifetime defaults to volatile
|
||||
depends_on:MBEDTLS_PK_C:MBEDTLS_PK_PARSE_C:MBEDTLS_RSA_C
|
||||
default_volatile_lifetime:1:PSA_KEY_TYPE_RSA_KEYPAIR:"3082025e02010002818100af057d396ee84fb75fdbb5c2b13c7fe5a654aa8aa2470b541ee1feb0b12d25c79711531249e1129628042dbbb6c120d1443524ef4c0e6e1d8956eeb2077af12349ddeee54483bc06c2c61948cd02b202e796aebd94d3a7cbf859c2c1819c324cb82b9cd34ede263a2abffe4733f077869e8660f7d6834da53d690ef7985f6bc3020301000102818100874bf0ffc2f2a71d14671ddd0171c954d7fdbf50281e4f6d99ea0e1ebcf82faa58e7b595ffb293d1abe17f110b37c48cc0f36c37e84d876621d327f64bbe08457d3ec4098ba2fa0a319fba411c2841ed7be83196a8cdf9daa5d00694bc335fc4c32217fe0488bce9cb7202e59468b1ead119000477db2ca797fac19eda3f58c1024100e2ab760841bb9d30a81d222de1eb7381d82214407f1b975cbbfe4e1a9467fd98adbd78f607836ca5be1928b9d160d97fd45c12d6b52e2c9871a174c66b488113024100c5ab27602159ae7d6f20c3c2ee851e46dc112e689e28d5fcbbf990a99ef8a90b8bb44fd36467e7fc1789ceb663abda338652c3c73f111774902e840565927091024100b6cdbd354f7df579a63b48b3643e353b84898777b48b15f94e0bfc0567a6ae5911d57ad6409cf7647bf96264e9bd87eb95e263b7110b9a1f9f94acced0fafa4d024071195eec37e8d257decfc672b07ae639f10cbb9b0c739d0c809968d644a94e3fd6ed9287077a14583f379058f76a8aecd43c62dc8c0f41766650d725275ac4a1024100bb32d133edc2e048d463388b7be9cb4be29f4b6250be603e70e3647501c97ddde20a4e71be95fd5e71784e25aca4baf25be5738aae59bbfe1c997781447a2b24"
|
||||
|
||||
Persistent key import
|
||||
depends_on:MBEDTLS_PK_C:MBEDTLS_PK_PARSE_C:MBEDTLS_RSA_C
|
||||
persistent_key_import:1:PSA_KEY_TYPE_RSA_KEYPAIR:"3082025e02010002818100af057d396ee84fb75fdbb5c2b13c7fe5a654aa8aa2470b541ee1feb0b12d25c79711531249e1129628042dbbb6c120d1443524ef4c0e6e1d8956eeb2077af12349ddeee54483bc06c2c61948cd02b202e796aebd94d3a7cbf859c2c1819c324cb82b9cd34ede263a2abffe4733f077869e8660f7d6834da53d690ef7985f6bc3020301000102818100874bf0ffc2f2a71d14671ddd0171c954d7fdbf50281e4f6d99ea0e1ebcf82faa58e7b595ffb293d1abe17f110b37c48cc0f36c37e84d876621d327f64bbe08457d3ec4098ba2fa0a319fba411c2841ed7be83196a8cdf9daa5d00694bc335fc4c32217fe0488bce9cb7202e59468b1ead119000477db2ca797fac19eda3f58c1024100e2ab760841bb9d30a81d222de1eb7381d82214407f1b975cbbfe4e1a9467fd98adbd78f607836ca5be1928b9d160d97fd45c12d6b52e2c9871a174c66b488113024100c5ab27602159ae7d6f20c3c2ee851e46dc112e689e28d5fcbbf990a99ef8a90b8bb44fd36467e7fc1789ceb663abda338652c3c73f111774902e840565927091024100b6cdbd354f7df579a63b48b3643e353b84898777b48b15f94e0bfc0567a6ae5911d57ad6409cf7647bf96264e9bd87eb95e263b7110b9a1f9f94acced0fafa4d024071195eec37e8d257decfc672b07ae639f10cbb9b0c739d0c809968d644a94e3fd6ed9287077a14583f379058f76a8aecd43c62dc8c0f41766650d725275ac4a1024100bb32d133edc2e048d463388b7be9cb4be29f4b6250be603e70e3647501c97ddde20a4e71be95fd5e71784e25aca4baf25be5738aae59bbfe1c997781447a2b24":PSA_SUCCESS
|
||||
|
|
|
|||
|
|
@ -85,7 +85,8 @@ exit:
|
|||
/* BEGIN_CASE */
|
||||
void save_large_persistent_key( int data_too_large, int expected_status )
|
||||
{
|
||||
psa_key_slot_t slot = 1;
|
||||
psa_key_id_t key_id = 42;
|
||||
psa_key_handle_t handle = 0;
|
||||
uint8_t *data = NULL;
|
||||
size_t data_length = PSA_CRYPTO_MAX_STORAGE_SIZE;
|
||||
|
||||
|
|
@ -96,180 +97,107 @@ void save_large_persistent_key( int data_too_large, int expected_status )
|
|||
|
||||
TEST_ASSERT( psa_crypto_init() == PSA_SUCCESS );
|
||||
|
||||
TEST_ASSERT( psa_set_key_lifetime(
|
||||
slot, PSA_KEY_LIFETIME_PERSISTENT ) == PSA_SUCCESS );
|
||||
TEST_ASSERT( psa_create_key( PSA_KEY_LIFETIME_PERSISTENT, key_id,
|
||||
PSA_KEY_TYPE_RAW_DATA,
|
||||
PSA_BYTES_TO_BITS( data_length ),
|
||||
&handle ) == PSA_SUCCESS );
|
||||
|
||||
TEST_ASSERT( psa_import_key( slot, PSA_KEY_TYPE_RAW_DATA,
|
||||
TEST_ASSERT( psa_import_key( handle, PSA_KEY_TYPE_RAW_DATA,
|
||||
data, data_length ) == expected_status );
|
||||
|
||||
exit:
|
||||
mbedtls_free( data );
|
||||
psa_destroy_persistent_key( slot );
|
||||
mbedtls_psa_crypto_free();
|
||||
}
|
||||
/* END_CASE */
|
||||
|
||||
|
||||
/* BEGIN_CASE */
|
||||
void persistent_key_is_configurable( int slot_arg, int type_arg,
|
||||
data_t *data )
|
||||
{
|
||||
psa_key_policy_t policy;
|
||||
psa_key_lifetime_t lifetime;
|
||||
psa_key_slot_t slot = (psa_key_slot_t) slot_arg;
|
||||
psa_key_type_t type = (psa_key_type_t) type_arg;
|
||||
|
||||
TEST_ASSERT( psa_crypto_init() == PSA_SUCCESS );
|
||||
|
||||
TEST_ASSERT( psa_set_key_lifetime(
|
||||
slot, PSA_KEY_LIFETIME_PERSISTENT ) == PSA_SUCCESS );
|
||||
|
||||
psa_key_policy_init( &policy );
|
||||
|
||||
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
|
||||
|
||||
TEST_ASSERT( psa_import_key( slot, type,
|
||||
data->x, data->len ) == PSA_SUCCESS );
|
||||
|
||||
TEST_ASSERT( psa_get_key_lifetime( slot, &lifetime ) == PSA_SUCCESS );
|
||||
|
||||
TEST_ASSERT( lifetime == PSA_KEY_LIFETIME_PERSISTENT );
|
||||
|
||||
exit:
|
||||
psa_destroy_persistent_key( slot );
|
||||
mbedtls_psa_crypto_free();
|
||||
psa_destroy_persistent_key( key_id );
|
||||
}
|
||||
/* END_CASE */
|
||||
|
||||
/* BEGIN_CASE */
|
||||
void persistent_key_destroy( int slot_arg, int should_store,
|
||||
void persistent_key_destroy( int key_id_arg, int should_store,
|
||||
int first_type_arg, data_t *first_data,
|
||||
int second_type_arg, data_t *second_data )
|
||||
{
|
||||
psa_key_policy_t policy;
|
||||
psa_key_slot_t slot = (psa_key_slot_t) slot_arg;
|
||||
psa_key_id_t key_id = key_id_arg;
|
||||
psa_key_handle_t handle = 0;
|
||||
psa_key_type_t first_type = (psa_key_type_t) first_type_arg;
|
||||
psa_key_type_t second_type = (psa_key_type_t) second_type_arg;
|
||||
|
||||
TEST_ASSERT( psa_crypto_init() == PSA_SUCCESS );
|
||||
|
||||
TEST_ASSERT( psa_set_key_lifetime(
|
||||
slot, PSA_KEY_LIFETIME_PERSISTENT ) == PSA_SUCCESS );
|
||||
|
||||
psa_key_policy_init( &policy );
|
||||
|
||||
TEST_ASSERT( psa_create_key( PSA_KEY_LIFETIME_PERSISTENT, key_id,
|
||||
first_type,
|
||||
PSA_BYTES_TO_BITS( first_data->len ),
|
||||
&handle ) == PSA_SUCCESS );
|
||||
|
||||
if( should_store == 1 )
|
||||
{
|
||||
TEST_ASSERT( psa_import_key(
|
||||
slot, first_type,
|
||||
handle, first_type,
|
||||
first_data->x, first_data->len ) == PSA_SUCCESS );
|
||||
}
|
||||
|
||||
/* Destroy the key */
|
||||
TEST_ASSERT( psa_destroy_key( slot ) == PSA_SUCCESS );
|
||||
|
||||
TEST_ASSERT( psa_get_key_information(
|
||||
slot, NULL, NULL ) == PSA_ERROR_EMPTY_SLOT );
|
||||
TEST_ASSERT( psa_destroy_key( handle ) == PSA_SUCCESS );
|
||||
|
||||
/* Check key slot storage is removed */
|
||||
TEST_ASSERT( psa_is_key_present_in_storage( slot ) == 0 );
|
||||
|
||||
/* Check destroying the key again doesn't report failure */
|
||||
TEST_ASSERT( psa_destroy_key( slot ) == PSA_SUCCESS );
|
||||
TEST_ASSERT( psa_get_key_information(
|
||||
slot, NULL, NULL ) == PSA_ERROR_EMPTY_SLOT );
|
||||
TEST_ASSERT( psa_is_key_present_in_storage( key_id ) == 0 );
|
||||
TEST_ASSERT( psa_open_key( PSA_KEY_LIFETIME_PERSISTENT, key_id,
|
||||
&handle ) == PSA_ERROR_EMPTY_SLOT );
|
||||
TEST_ASSERT( handle == 0 );
|
||||
|
||||
/* Shutdown and restart */
|
||||
mbedtls_psa_crypto_free();
|
||||
|
||||
TEST_ASSERT( psa_crypto_init() == PSA_SUCCESS );
|
||||
|
||||
/* Mark slot as persistent again */
|
||||
TEST_ASSERT( psa_set_key_lifetime(
|
||||
slot, PSA_KEY_LIFETIME_PERSISTENT ) == PSA_SUCCESS );
|
||||
|
||||
/* Check key slot is empty */
|
||||
TEST_ASSERT( psa_get_key_information(
|
||||
slot, NULL, NULL ) == PSA_ERROR_EMPTY_SLOT );
|
||||
|
||||
/* Import different key data to ensure slot really was empty */
|
||||
psa_key_policy_init( &policy );
|
||||
|
||||
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_EXPORT,
|
||||
PSA_ALG_VENDOR_FLAG );
|
||||
|
||||
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
|
||||
|
||||
/* Create another key in the same slot */
|
||||
TEST_ASSERT( psa_create_key( PSA_KEY_LIFETIME_PERSISTENT, key_id,
|
||||
second_type,
|
||||
PSA_BYTES_TO_BITS( second_data->len ),
|
||||
&handle ) == PSA_SUCCESS );
|
||||
TEST_ASSERT( psa_import_key(
|
||||
slot, second_type,
|
||||
handle, second_type,
|
||||
second_data->x, second_data->len ) == PSA_SUCCESS );
|
||||
|
||||
exit:
|
||||
psa_destroy_persistent_key( slot );
|
||||
mbedtls_psa_crypto_free();
|
||||
psa_destroy_persistent_key( key_id );
|
||||
}
|
||||
/* END_CASE */
|
||||
|
||||
/* BEGIN_CASE */
|
||||
void default_volatile_lifetime( int slot_arg, int type_arg, data_t *data )
|
||||
{
|
||||
psa_key_policy_t policy;
|
||||
psa_key_slot_t slot = (psa_key_slot_t) slot_arg;
|
||||
psa_key_type_t type = (psa_key_type_t) type_arg;
|
||||
|
||||
TEST_ASSERT( psa_crypto_init() == PSA_SUCCESS );
|
||||
|
||||
psa_key_policy_init( &policy );
|
||||
|
||||
TEST_ASSERT( psa_import_key( slot, type,
|
||||
data->x, data->len ) == PSA_SUCCESS );
|
||||
|
||||
/* Shutdown and restart */
|
||||
mbedtls_psa_crypto_free();
|
||||
|
||||
TEST_ASSERT( psa_crypto_init() == PSA_SUCCESS );
|
||||
|
||||
/* Check key slot is empty */
|
||||
TEST_ASSERT( psa_get_key_information(
|
||||
slot, NULL, NULL ) == PSA_ERROR_EMPTY_SLOT );
|
||||
|
||||
exit:
|
||||
psa_destroy_persistent_key( slot );
|
||||
mbedtls_psa_crypto_free();
|
||||
}
|
||||
/* END_CASE */
|
||||
|
||||
/* BEGIN_CASE */
|
||||
void persistent_key_import( int slot_arg, int type_arg, data_t *data,
|
||||
void persistent_key_import( int key_id_arg, int type_arg, data_t *data,
|
||||
int expected_status )
|
||||
{
|
||||
psa_key_policy_t policy;
|
||||
psa_key_lifetime_t lifetime;
|
||||
psa_key_slot_t slot = (psa_key_slot_t) slot_arg;
|
||||
psa_key_id_t key_id = (psa_key_id_t) key_id_arg;
|
||||
psa_key_type_t type = (psa_key_type_t) type_arg;
|
||||
psa_key_handle_t handle = 0;
|
||||
|
||||
TEST_ASSERT( psa_crypto_init() == PSA_SUCCESS );
|
||||
|
||||
TEST_ASSERT( psa_set_key_lifetime(
|
||||
slot, PSA_KEY_LIFETIME_PERSISTENT ) == PSA_SUCCESS );
|
||||
|
||||
TEST_ASSERT( psa_create_key( PSA_KEY_LIFETIME_PERSISTENT, key_id,
|
||||
type,
|
||||
PSA_BYTES_TO_BITS( data->len ),
|
||||
&handle ) == PSA_SUCCESS );
|
||||
psa_key_policy_init( &policy );
|
||||
|
||||
TEST_ASSERT( psa_import_key( slot, type,
|
||||
TEST_ASSERT( psa_import_key( handle, type,
|
||||
data->x, data->len ) == expected_status );
|
||||
|
||||
if( expected_status != PSA_SUCCESS )
|
||||
{
|
||||
TEST_ASSERT( psa_is_key_present_in_storage( slot ) == 0 );
|
||||
TEST_ASSERT( psa_is_key_present_in_storage( key_id ) == 0 );
|
||||
goto exit;
|
||||
}
|
||||
|
||||
TEST_ASSERT( psa_get_key_lifetime( slot, &lifetime ) == PSA_SUCCESS );
|
||||
|
||||
TEST_ASSERT( psa_get_key_lifetime( handle, &lifetime ) == PSA_SUCCESS );
|
||||
TEST_ASSERT( lifetime == PSA_KEY_LIFETIME_PERSISTENT );
|
||||
|
||||
exit:
|
||||
psa_destroy_persistent_key( slot );
|
||||
psa_destroy_persistent_key( key_id );
|
||||
mbedtls_psa_crypto_free();
|
||||
}
|
||||
/* END_CASE */
|
||||
|
|
@ -278,8 +206,9 @@ exit:
|
|||
void import_export_persistent_key( data_t *data, int type_arg,
|
||||
int expected_bits, int key_not_exist )
|
||||
{
|
||||
psa_key_slot_t slot = 1;
|
||||
psa_key_id_t key_id = 42;
|
||||
psa_key_type_t type = (psa_key_type_t) type_arg;
|
||||
psa_key_handle_t handle = 0;
|
||||
unsigned char *exported = NULL;
|
||||
size_t export_size = data->len;
|
||||
size_t exported_length;
|
||||
|
|
@ -292,51 +221,48 @@ void import_export_persistent_key( data_t *data, int type_arg,
|
|||
|
||||
TEST_ASSERT( psa_crypto_init( ) == PSA_SUCCESS );
|
||||
|
||||
TEST_ASSERT( psa_set_key_lifetime(
|
||||
slot, PSA_KEY_LIFETIME_PERSISTENT ) == PSA_SUCCESS );
|
||||
TEST_ASSERT( psa_create_key( PSA_KEY_LIFETIME_PERSISTENT, key_id,
|
||||
type,
|
||||
PSA_BYTES_TO_BITS( data->len ),
|
||||
&handle ) == PSA_SUCCESS );
|
||||
|
||||
psa_key_policy_init( &policy );
|
||||
|
||||
psa_key_policy_set_usage( &policy, PSA_KEY_USAGE_EXPORT,
|
||||
PSA_ALG_VENDOR_FLAG );
|
||||
|
||||
TEST_ASSERT( psa_set_key_policy( slot, &policy ) == PSA_SUCCESS );
|
||||
TEST_ASSERT( psa_set_key_policy( handle, &policy ) == PSA_SUCCESS );
|
||||
|
||||
/* Import the key */
|
||||
TEST_ASSERT( psa_import_key( slot, type,
|
||||
TEST_ASSERT( psa_import_key( handle, type,
|
||||
data->x, data->len ) == PSA_SUCCESS );
|
||||
|
||||
TEST_ASSERT( psa_get_key_lifetime(
|
||||
slot, &lifetime_get ) == PSA_SUCCESS );
|
||||
TEST_ASSERT( psa_get_key_lifetime( handle, &lifetime_get ) == PSA_SUCCESS );
|
||||
TEST_ASSERT( lifetime_get == PSA_KEY_LIFETIME_PERSISTENT );
|
||||
|
||||
/* Test the key information */
|
||||
TEST_ASSERT( psa_get_key_information(
|
||||
slot, &got_type, &got_bits ) == PSA_SUCCESS );
|
||||
handle, &got_type, &got_bits ) == PSA_SUCCESS );
|
||||
TEST_ASSERT( got_type == type );
|
||||
TEST_ASSERT( got_bits == (size_t) expected_bits );
|
||||
|
||||
TEST_ASSERT( psa_is_key_present_in_storage( slot ) == 1 );
|
||||
TEST_ASSERT( psa_is_key_present_in_storage( key_id ) == 1 );
|
||||
|
||||
if( key_not_exist )
|
||||
{
|
||||
psa_destroy_persistent_key( slot );
|
||||
psa_destroy_persistent_key( key_id );
|
||||
}
|
||||
/* Export the key */
|
||||
TEST_ASSERT( psa_export_key( slot, exported, export_size,
|
||||
TEST_ASSERT( psa_export_key( handle, exported, export_size,
|
||||
&exported_length ) == PSA_SUCCESS );
|
||||
|
||||
ASSERT_COMPARE( data->x, data->len, exported, exported_length );
|
||||
|
||||
/* Destroy the key */
|
||||
TEST_ASSERT( psa_destroy_key( slot ) == PSA_SUCCESS );
|
||||
TEST_ASSERT( psa_get_key_information(
|
||||
slot, NULL, NULL ) == PSA_ERROR_EMPTY_SLOT );
|
||||
TEST_ASSERT( psa_is_key_present_in_storage( slot ) == 0 );
|
||||
TEST_ASSERT( psa_destroy_key( handle ) == PSA_SUCCESS );
|
||||
TEST_ASSERT( psa_is_key_present_in_storage( key_id ) == 0 );
|
||||
|
||||
exit:
|
||||
mbedtls_free( exported );
|
||||
psa_destroy_persistent_key( slot );
|
||||
mbedtls_psa_crypto_free( );
|
||||
psa_destroy_persistent_key( key_id );
|
||||
}
|
||||
/* END_CASE */
|
||||
|
|
|
|||
|
|
@ -11,9 +11,11 @@
|
|||
*/
|
||||
|
||||
/* BEGIN_CASE */
|
||||
void load_data_from_file( int slot_to_load, data_t *data, int should_make_file,
|
||||
void load_data_from_file( int id_to_load_arg,
|
||||
data_t *data, int should_make_file,
|
||||
int capacity_arg, int expected_status )
|
||||
{
|
||||
psa_key_id_t id_to_load = id_to_load_arg;
|
||||
char slot_location[] = "psa_key_slot_1";
|
||||
psa_status_t status;
|
||||
int ret;
|
||||
|
|
@ -36,8 +38,7 @@ void load_data_from_file( int slot_to_load, data_t *data, int should_make_file,
|
|||
/* Read from the file with psa_crypto_storage_load. */
|
||||
loaded_data = mbedtls_calloc( 1, capacity );
|
||||
TEST_ASSERT( loaded_data != NULL );
|
||||
status = psa_crypto_storage_load( (psa_key_slot_t) slot_to_load, loaded_data,
|
||||
file_size );
|
||||
status = psa_crypto_storage_load( id_to_load, loaded_data, file_size );
|
||||
|
||||
/* Check we get the expected status. */
|
||||
TEST_ASSERT( status == expected_status );
|
||||
|
|
|
|||
Loading…
Reference in a new issue