yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
mbedtls/tests/suites/test_suite_psa_crypto_slot_management.function

1062 lines
39 KiB
Text
Raw Normal View History

Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
/* BEGIN_HEADER */
#include <stdint.h>
Define handles as key identifiers Define psa_key_handle_t to be equal to mbedtls_svc_key_id_t. Make the handle of a persistent key be equal to its key identifier. For volatile keys, make the key handle equal to the volatile key identifier of the created volatile key. The unit tests are modified just to make them compile not to make them run successfully. They are fixed in the subsequent commits. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-31 11:26:37 +02:00
#include "psa_crypto_slot_management.h"
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
#include "psa_crypto_storage.h"
typedef enum
{
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
/**< Close key(s) */
INVALIDATE_BY_CLOSING,
/**< Destroy key(s) */
INVALIDATE_BY_DESTROYING,
tests: slot mgmt: Add psa_purge_key testing Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:50:24 +02:00
/**< Purge key(s) */
INVALIDATE_BY_PURGING,
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
/**< Terminate and reinitialize without closing/destroying keys */
INVALIDATE_BY_SHUTDOWN,
/**< Close key(s) then terminate and re-initialize */
INVALIDATE_BY_CLOSING_WITH_SHUTDOWN,
/**< Destroy key(s) then terminate and re-initialize */
INVALIDATE_BY_DESTROYING_WITH_SHUTDOWN,
tests: slot mgmt: Add psa_purge_key testing Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:50:24 +02:00
/**< Purge key(s) then terminate and re-initialize */
INVALIDATE_BY_PURGING_WITH_SHUTDOWN,
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
} invalidate_method_t;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
typedef enum
{
KEEP_OPEN,
CLOSE_BEFORE,
CLOSE_AFTER,
} reopen_policy_t;
Consolidate invalid-handle tests Consolidate the invalid-handle tests from test_suite_psa_crypto and test_suite_psa_crypto_slot_management. Start with the code in test_suite_psa_crypto_slot_management and adapt it to test one invalid handle value per run of the test function.
2019-10-11 11:44:48 +02:00
typedef enum
{
INVALID_HANDLE_0,
INVALID_HANDLE_UNOPENED,
INVALID_HANDLE_CLOSED,
INVALID_HANDLE_HUGE,
} invalid_handle_construction_t;
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
/** Apply \p invalidate_method to invalidate the specified key:
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
* close it, destroy it, or do nothing;
*/
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
static int invalidate_key( invalidate_method_t invalidate_method,
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
mbedtls_svc_key_id_t key )
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
{
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
switch( invalidate_method )
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
{
Prefer persistent over permanent For consistency across the code base, prefer persistent over permanent to qualify a key stored in persistent storage. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 18:08:03 +01:00
/* Closing the key invalidate only volatile keys, not persistent ones. */
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
case INVALIDATE_BY_CLOSING:
case INVALIDATE_BY_CLOSING_WITH_SHUTDOWN:
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_close_key( key ) );
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
break;
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
case INVALIDATE_BY_DESTROYING:
case INVALIDATE_BY_DESTROYING_WITH_SHUTDOWN:
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_destroy_key( key ) );
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
break;
Fix several typos Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 17:45:56 +01:00
/* Purging the key just purges RAM data of persistent keys. */
tests: slot mgmt: Add psa_purge_key testing Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:50:24 +02:00
case INVALIDATE_BY_PURGING:
case INVALIDATE_BY_PURGING_WITH_SHUTDOWN:
PSA_ASSERT( psa_purge_key( key ) );
break;
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
case INVALIDATE_BY_SHUTDOWN:
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
break;
}
return( 1 );
exit:
return( 0 );
}
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
/** Restart the PSA subsystem if \p invalidate_method says so. */
static int invalidate_psa( invalidate_method_t invalidate_method )
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
{
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
switch( invalidate_method )
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
{
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
case INVALIDATE_BY_CLOSING:
case INVALIDATE_BY_DESTROYING:
tests: slot mgmt: Add psa_purge_key testing Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:50:24 +02:00
case INVALIDATE_BY_PURGING:
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
return( 1 );
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
case INVALIDATE_BY_CLOSING_WITH_SHUTDOWN:
case INVALIDATE_BY_DESTROYING_WITH_SHUTDOWN:
tests: slot mgmt: Add psa_purge_key testing Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:50:24 +02:00
case INVALIDATE_BY_PURGING_WITH_SHUTDOWN:
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
/* All keys must have been closed. */
Destroy recorded persistent keys in PSA_DONE() This ensures that test cases won't leave persistent files behind even on failure, provided they use TEST_USES_KEY_ID(). Test cases that don't use this macro are unaffected. Tests that use PSA_DONE() midway and expect persistent keys to survive must use PSA_SESSION_DONE() instead. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2021-02-14 14:08:22 +01:00
PSA_SESSION_DONE( );
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
break;
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
case INVALIDATE_BY_SHUTDOWN:
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
/* Some keys may remain behind, and we're testing that this
* properly closes them. */
mbedtls_psa_crypto_free( );
break;
}
PSA_ASSERT( psa_crypto_init( ) );
ASSERT_PSA_PRISTINE( );
return( 1 );
exit:
return( 0 );
}
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
/* END_HEADER */
/* BEGIN_DEPENDENCIES
* depends_on:MBEDTLS_PSA_CRYPTO_C
* END_DEPENDENCIES
*/
/* BEGIN_CASE */
Add tests checking owner of volatile keys When key identifiers encode key owner, add tests checking that: . the key owner of an imported volatile key is the one specified. . a key identifier of a volatile key with a valid PSA key identifier but the wrong owner is rejected. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-16 15:32:23 +02:00
void transient_slot_lifecycle( int owner_id_arg,
int usage_arg, int alg_arg,
Don't require a type and size when creating a key slot Remove the type and bits arguments to psa_allocate_key() and psa_create_key(). They can be useful if the implementation wants to know exactly how much space to allocate for the slot, but many implementations (including ours) don't care, and it's possible to work around their lack by deferring size-dependent actions to the time when the key material is created. They are a burden to applications and make the API more complex, and the benefits aren't worth it. Change the API and adapt the implementation, the units test and the sample code accordingly.
2019-01-19 12:20:52 +01:00
int type_arg, data_t *key_data,
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
int invalidate_method_arg )
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
{
psa_algorithm_t alg = alg_arg;
psa_key_usage_t usage_flags = usage_arg;
Don't require a type and size when creating a key slot Remove the type and bits arguments to psa_allocate_key() and psa_create_key(). They can be useful if the implementation wants to know exactly how much space to allocate for the slot, but many implementations (including ours) don't care, and it's possible to work around their lack by deferring size-dependent actions to the time when the key material is created. They are a burden to applications and make the API more complex, and the benefits aren't worth it. Change the API and adapt the implementation, the units test and the sample code accordingly.
2019-01-19 12:20:52 +01:00
psa_key_type_t type = type_arg;
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
invalidate_method_t invalidate_method = invalidate_method_arg;
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
mbedtls_svc_key_id_t key = MBEDTLS_SVC_KEY_ID_INIT;
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
Increment the test step number when invalidating a key This makes failure messages easier to understand. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2021-02-14 23:45:48 +01:00
mbedtls_test_set_step( 1 );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
PSA_ASSERT( psa_crypto_init( ) );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
/* Import a key. */
Miscellaneous coding style fixes Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-11 15:19:20 +01:00
#if defined(MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER)
Add tests checking owner of volatile keys When key identifiers encode key owner, add tests checking that: . the key owner of an imported volatile key is the one specified. . a key identifier of a volatile key with a valid PSA key identifier but the wrong owner is rejected. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-16 15:32:23 +02:00
mbedtls_key_owner_id_t owner_id = owner_id_arg;
mbedtls_set_key_owner_id( &attributes, owner_id );
Miscellaneous coding style fixes Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-11 15:19:20 +01:00
#else
Add tests checking owner of volatile keys When key identifiers encode key owner, add tests checking that: . the key owner of an imported volatile key is the one specified. . a key identifier of a volatile key with a valid PSA key identifier but the wrong owner is rejected. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-16 15:32:23 +02:00
(void)owner_id_arg;
Miscellaneous coding style fixes Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-11 15:19:20 +01:00
#endif
Add tests checking owner of volatile keys When key identifiers encode key owner, add tests checking that: . the key owner of an imported volatile key is the one specified. . a key identifier of a volatile key with a valid PSA key identifier but the wrong owner is rejected. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-16 15:32:23 +02:00
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_set_key_usage_flags( &attributes, usage_flags );
psa_set_key_algorithm( &attributes, alg );
psa_set_key_type( &attributes, type );
Split long lines after psa_import_key refactoring
2019-05-15 20:22:09 +02:00
PSA_ASSERT( psa_import_key( &attributes, key_data->x, key_data->len,
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
&key ) );
TEST_ASSERT( ! mbedtls_svc_key_id_is_null( key ) );
PSA_ASSERT( psa_get_key_attributes( key, &attributes ) );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
TEST_EQUAL( psa_get_key_type( &attributes ), type );
tests: slot mgmt: Add purge checks in volatile key lifecycle test Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:01:35 +02:00
psa_reset_key_attributes( &attributes );
Miscellaneous coding style fixes Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-11 15:19:20 +01:00
#if defined(MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER)
Add tests checking owner of volatile keys When key identifiers encode key owner, add tests checking that: . the key owner of an imported volatile key is the one specified. . a key identifier of a volatile key with a valid PSA key identifier but the wrong owner is rejected. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-16 15:32:23 +02:00
{
psa_key_handle_t handle;
mbedtls_svc_key_id_t key_with_invalid_owner =
mbedtls_svc_key_id_make( owner_id + 1,
MBEDTLS_SVC_KEY_ID_GET_KEY_ID( key ) );
TEST_ASSERT( mbedtls_key_owner_id_equal(
owner_id,
MBEDTLS_SVC_KEY_ID_GET_OWNER_ID( key ) ) );
TEST_EQUAL( psa_open_key( key_with_invalid_owner, &handle ),
PSA_ERROR_DOES_NOT_EXIST );
}
Miscellaneous coding style fixes Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-11 15:19:20 +01:00
#endif
Add tests checking owner of volatile keys When key identifiers encode key owner, add tests checking that: . the key owner of an imported volatile key is the one specified. . a key identifier of a volatile key with a valid PSA key identifier but the wrong owner is rejected. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-16 15:32:23 +02:00
tests: slot mgmt: Add purge checks in volatile key lifecycle test Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:01:35 +02:00
/*
* Purge the key and make sure that it is still valid, as purging a
* volatile key shouldn't invalidate/destroy it.
*/
PSA_ASSERT( psa_purge_key( key ) );
PSA_ASSERT( psa_get_key_attributes( key, &attributes ) );
TEST_EQUAL( psa_get_key_type( &attributes ), type );
psa_reset_key_attributes( &attributes );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
/* Do something that invalidates the key. */
Increment the test step number when invalidating a key This makes failure messages easier to understand. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2021-02-14 23:45:48 +01:00
mbedtls_test_set_step( 2 );
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
if( ! invalidate_key( invalidate_method, key ) )
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
goto exit;
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
if( ! invalidate_psa( invalidate_method ) )
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
goto exit;
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
/* Test that the key is now invalid. */
TEST_EQUAL( psa_get_key_attributes( key, &attributes ),
Update tests for other invalid key operations. Update expected return values of psa_get_key_attributes(), psa_export_key() and other key api(s) to PSA_ERROR_INVALID_HANDLE for invalid key. Signed-off-by: Maulik Patel <Maulik.Patel@arm.com>
2021-03-17 17:11:05 +01:00
PSA_ERROR_INVALID_HANDLE );
Update tests for psa_close_key for invalid key. Update expected return values of psa_close_key() to PSA_ERROR_INVALID_HANDLE for invalid key handle operations. Signed-off-by: Maulik Patel <Maulik.Patel@arm.com>
2021-03-17 16:05:13 +01:00
TEST_EQUAL( psa_close_key( key ), PSA_ERROR_INVALID_HANDLE );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
exit:
tests: psa: Reset key attributes where needed After a call to psa_get_key_attributes() to retrieve the attributes of a key into a psa_key_attributes_t structure, a call to psa_reset_key_attributes() is mandated to free the resources that may be referenced by the psa_key_attributes_t structure. Not calling psa_reset_key_attributes() may result in a memory leak. When a test function calls psa_get_key_parameters() the associated key attributes are systematically reset in the clean-up part of the function with a comment to emphasize the need for the reset and make it more visible. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-19 17:55:23 +01:00
/*
* Key attributes may have been returned by psa_get_key_attributes()
* thus reset them as required.
*/
psa_reset_key_attributes( &attributes );
Replace all calls to mbedtls_psa_crypto_free by PSA_DONE Replace all calls to mbedtls_psa_crypto_free in tests by PSA_DONE. This is correct for most tests, because most tests close open keys. A few tests now fail; these tests need to be reviewed and switched back to mbedtls_psa_crypto_free if they genuinely expected to end with some slots still in use.
2019-05-28 15:10:21 +02:00
PSA_DONE( );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
}
/* END_CASE */
Fix the build without persistent storage Add missing guards on MBEDTLS_PSA_CRYPTO_STORAGE_C. Add test cases to test that psa_create_key and psa_open_key return NOT_SUPPORTED.
2018-12-03 18:19:39 +01:00
/* BEGIN_CASE depends_on:MBEDTLS_PSA_CRYPTO_STORAGE_C */
tests: psa: Add owner identifier as test parameter To test the proper handling of owner identifier as of key identifiers, add owner identifier(s) to tests having key identifier(s) as test parameters. Just don't do it for tests related to tests invalid values of key identifiers as there is no owner identifier invalid values. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-28 15:06:14 +02:00
void persistent_slot_lifecycle( int lifetime_arg, int owner_id_arg, int id_arg,
Enrollment algorithm in policy: test persistent keys
2019-05-13 14:32:11 +02:00
int usage_arg, int alg_arg, int alg2_arg,
Don't require a type and size when creating a key slot Remove the type and bits arguments to psa_allocate_key() and psa_create_key(). They can be useful if the implementation wants to know exactly how much space to allocate for the slot, but many implementations (including ours) don't care, and it's possible to work around their lack by deferring size-dependent actions to the time when the key material is created. They are a burden to applications and make the API more complex, and the benefits aren't worth it. Change the API and adapt the implementation, the units test and the sample code accordingly.
2019-01-19 12:20:52 +01:00
int type_arg, data_t *key_data,
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
int invalidate_method_arg )
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
{
psa_key_lifetime_t lifetime = lifetime_arg;
tests: psa: Add owner identifier as test parameter To test the proper handling of owner identifier as of key identifiers, add owner identifier(s) to tests having key identifier(s) as test parameters. Just don't do it for tests related to tests invalid values of key identifiers as there is no owner identifier invalid values. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-28 15:06:14 +02:00
mbedtls_svc_key_id_t id = mbedtls_svc_key_id_make( owner_id_arg, id_arg );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
psa_algorithm_t alg = alg_arg;
Enrollment algorithm in policy: test persistent keys
2019-05-13 14:32:11 +02:00
psa_algorithm_t alg2 = alg2_arg;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
psa_key_usage_t usage_flags = usage_arg;
Don't require a type and size when creating a key slot Remove the type and bits arguments to psa_allocate_key() and psa_create_key(). They can be useful if the implementation wants to know exactly how much space to allocate for the slot, but many implementations (including ours) don't care, and it's possible to work around their lack by deferring size-dependent actions to the time when the key material is created. They are a burden to applications and make the API more complex, and the benefits aren't worth it. Change the API and adapt the implementation, the units test and the sample code accordingly.
2019-01-19 12:20:52 +01:00
psa_key_type_t type = type_arg;
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
invalidate_method_t invalidate_method = invalidate_method_arg;
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
mbedtls_svc_key_id_t returned_id = MBEDTLS_SVC_KEY_ID_INIT;
Introduce PSA_KEY_HANDLE_INIT macro Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-30 17:48:03 +02:00
psa_key_handle_t handle = PSA_KEY_HANDLE_INIT;
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
psa_key_attributes_t read_attributes = PSA_KEY_ATTRIBUTES_INIT;
uint8_t *reexported = NULL;
size_t reexported_length = -1;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
tests: psa: Add checks involving unknown key owner ids Add checks involving unknown key owner identifiers in tests related to SE and persistent keys. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-29 15:24:05 +02:00
#if defined(MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER)
mbedtls_svc_key_id_t wrong_owner_id =
mbedtls_svc_key_id_make( owner_id_arg + 1, id_arg );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
mbedtls_svc_key_id_t invalid_svc_key_id = MBEDTLS_SVC_KEY_ID_INIT;
tests: psa: Add checks involving unknown key owner ids Add checks involving unknown key owner identifiers in tests related to SE and persistent keys. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-29 15:24:05 +02:00
#endif
Slot management tests: more robust storage purge Record what key ids have been used in a test case and purge them. The cleanup code no longer requires the key identifiers used in the tests to be in a certain small range.
2019-05-06 18:39:37 +02:00
TEST_USES_KEY_ID( id );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
Increment the test step number when invalidating a key This makes failure messages easier to understand. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2021-02-14 23:45:48 +01:00
mbedtls_test_set_step( 1 );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
PSA_ASSERT( psa_crypto_init( ) );
Replace psa_make_key_persistent by id/lifetime setters in tests Remove all internal uses of psa_make_key_persistent.
2019-05-15 16:12:22 +02:00
psa_set_key_id( &attributes, id );
psa_set_key_lifetime( &attributes, lifetime );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_set_key_type( &attributes, type );
psa_set_key_usage_flags( &attributes, usage_flags );
psa_set_key_algorithm( &attributes, alg );
Enrollment algorithm in policy: test persistent keys
2019-05-13 14:32:11 +02:00
psa_set_key_enrollment_algorithm( &attributes, alg2 );
Split long lines after psa_import_key refactoring
2019-05-15 20:22:09 +02:00
PSA_ASSERT( psa_import_key( &attributes, key_data->x, key_data->len,
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
&returned_id ) );
TEST_ASSERT( mbedtls_svc_key_id_equal( id, returned_id ) );
tests: psa: Add checks involving unknown key owner ids Add checks involving unknown key owner identifiers in tests related to SE and persistent keys. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-29 15:24:05 +02:00
#if defined(MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER)
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
TEST_EQUAL( psa_open_key( wrong_owner_id, &invalid_svc_key_id ),
tests: psa: Add checks involving unknown key owner ids Add checks involving unknown key owner identifiers in tests related to SE and persistent keys. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-29 15:24:05 +02:00
PSA_ERROR_DOES_NOT_EXIST );
#endif
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_get_key_attributes( id, &attributes ) );
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
TEST_EQUAL( psa_get_key_lifetime( &attributes ), lifetime );
Fix PSA code and unit tests Fix PSA code and unit tests for the unit tests to pass with key identifiers encoding owner identifiers. The changes in PSA code just make the enablement of key identifiers encoding owner identifiers platform independent. Previous to this commit, such key identifiers were used only in the case of PSA SPM platforms. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-23 17:13:42 +02:00
TEST_ASSERT( mbedtls_svc_key_id_equal(
psa_get_key_id( &attributes ), id ) );
Update tests for extended key usage policies Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com>
2021-05-13 12:05:01 +02:00
TEST_EQUAL( psa_get_key_usage_flags( &attributes ),
Rename function to conform to the library Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com>
2021-06-28 14:05:00 +02:00
mbedtls_test_update_key_usage_flags( usage_flags ) );
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
TEST_EQUAL( psa_get_key_algorithm( &attributes ), alg );
Enrollment algorithm in policy: test persistent keys
2019-05-13 14:32:11 +02:00
TEST_EQUAL( psa_get_key_enrollment_algorithm( &attributes ), alg2 );
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
TEST_EQUAL( psa_get_key_type( &attributes ), type );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
/* Close the key and then open it. */
PSA_ASSERT( psa_close_key( id ) );
tests: psa: Add checks involving unknown key owner ids Add checks involving unknown key owner identifiers in tests related to SE and persistent keys. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-29 15:24:05 +02:00
#if defined(MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER)
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
TEST_EQUAL( psa_open_key( wrong_owner_id, &invalid_svc_key_id ),
tests: psa: Add checks involving unknown key owner ids Add checks involving unknown key owner identifiers in tests related to SE and persistent keys. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-29 15:24:05 +02:00
PSA_ERROR_DOES_NOT_EXIST );
#endif
Remove lifetime parameter from psa_open_key Change the scope of key identifiers to be global, rather than per lifetime. As a result, you now need to specify the lifetime of a key only when creating it.
2019-05-06 18:44:55 +02:00
PSA_ASSERT( psa_open_key( id, &handle ) );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
TEST_ASSERT( ! psa_key_handle_is_null( handle ) );
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
PSA_ASSERT( psa_get_key_attributes( handle, &attributes ) );
TEST_EQUAL( psa_get_key_lifetime( &attributes ), lifetime );
Fix PSA code and unit tests Fix PSA code and unit tests for the unit tests to pass with key identifiers encoding owner identifiers. The changes in PSA code just make the enablement of key identifiers encoding owner identifiers platform independent. Previous to this commit, such key identifiers were used only in the case of PSA SPM platforms. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-23 17:13:42 +02:00
TEST_ASSERT( mbedtls_svc_key_id_equal(
psa_get_key_id( &attributes ), id ) );
Update tests for extended key usage policies Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com>
2021-05-13 12:05:01 +02:00
TEST_EQUAL( psa_get_key_usage_flags( &attributes ),
Rename function to conform to the library Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com>
2021-06-28 14:05:00 +02:00
mbedtls_test_update_key_usage_flags( usage_flags ) );
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
TEST_EQUAL( psa_get_key_algorithm( &attributes ), alg );
Enrollment algorithm in policy: test persistent keys
2019-05-13 14:32:11 +02:00
TEST_EQUAL( psa_get_key_enrollment_algorithm( &attributes ), alg2 );
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
TEST_EQUAL( psa_get_key_type( &attributes ), type );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
/*
* Do something that wipes key data in volatile memory or destroy the
* key.
*/
Increment the test step number when invalidating a key This makes failure messages easier to understand. Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
2021-02-14 23:45:48 +01:00
mbedtls_test_set_step( 2 );
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
if( ! invalidate_key( invalidate_method, id ) )
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
goto exit;
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
if( ! invalidate_psa( invalidate_method ) )
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
goto exit;
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
/* Try to reaccess the key. If we destroyed it, check that it doesn't
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
* exist. Otherwise check that it still exists and has the expected
* content. */
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
switch( invalidate_method )
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
{
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
case INVALIDATE_BY_CLOSING:
case INVALIDATE_BY_CLOSING_WITH_SHUTDOWN:
tests: slot mgmt: Add psa_purge_key testing Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:50:24 +02:00
case INVALIDATE_BY_PURGING:
case INVALIDATE_BY_PURGING_WITH_SHUTDOWN:
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
case INVALIDATE_BY_SHUTDOWN:
Remove lifetime parameter from psa_open_key Change the scope of key identifiers to be global, rather than per lifetime. As a result, you now need to specify the lifetime of a key only when creating it.
2019-05-06 18:44:55 +02:00
PSA_ASSERT( psa_open_key( id, &handle ) );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_get_key_attributes( id, &read_attributes ) );
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
TEST_EQUAL( psa_get_key_lifetime( &attributes ),
psa_get_key_lifetime( &read_attributes ) );
Fix PSA code and unit tests Fix PSA code and unit tests for the unit tests to pass with key identifiers encoding owner identifiers. The changes in PSA code just make the enablement of key identifiers encoding owner identifiers platform independent. Previous to this commit, such key identifiers were used only in the case of PSA SPM platforms. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-23 17:13:42 +02:00
TEST_ASSERT( mbedtls_svc_key_id_equal(
psa_get_key_id( &attributes ),
psa_get_key_id( &read_attributes ) ) );
Update tests for extended key usage policies Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com>
2021-05-13 12:05:01 +02:00
TEST_EQUAL( psa_get_key_usage_flags( &attributes ),
Rename function to conform to the library Signed-off-by: gabor-mezei-arm <gabor.mezei@arm.com>
2021-06-28 14:05:00 +02:00
mbedtls_test_update_key_usage_flags( usage_flags ) );
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
TEST_EQUAL( psa_get_key_algorithm( &attributes ),
psa_get_key_algorithm( &read_attributes ) );
Enrollment algorithm in policy: test persistent keys
2019-05-13 14:32:11 +02:00
TEST_EQUAL( psa_get_key_enrollment_algorithm( &attributes ),
psa_get_key_enrollment_algorithm( &read_attributes ) );
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
TEST_EQUAL( psa_get_key_type( &attributes ),
psa_get_key_type( &read_attributes ) );
TEST_EQUAL( psa_get_key_bits( &attributes ),
psa_get_key_bits( &read_attributes ) );
tests: psa: Fix export related tests Fix some export related tests that were relying on the fact that the size of the output buffer was checked after other parameters. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2021-01-18 13:32:28 +01:00
ASSERT_ALLOC( reexported, key_data->len );
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
if( usage_flags & PSA_KEY_USAGE_EXPORT )
{
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_export_key( id, reexported, key_data->len,
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
&reexported_length ) );
ASSERT_COMPARE( key_data->x, key_data->len,
reexported, reexported_length );
}
else
{
tests: psa: Fix export related tests Fix some export related tests that were relying on the fact that the size of the output buffer was checked after other parameters. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2021-01-18 13:32:28 +01:00
TEST_EQUAL( psa_export_key( id, reexported,
key_data->len, &reexported_length ),
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
PSA_ERROR_NOT_PERMITTED );
}
Close or destroy keys explicitly in tests
2019-05-28 14:08:50 +02:00
PSA_ASSERT( psa_close_key( handle ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
break;
Test shutdown without closing handles Add some test cases that shut down and restart without explicitly closing handles, and check that the handles are properly invalidated.
2019-05-28 15:06:43 +02:00
tests: slot mgmt: Rename ways of invalidating keys Rename ways of invalidating keys before introducing key purging tests because the "CLOSE_BY" prefix doesn't get on well with the purge operation. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-20 17:24:41 +02:00
case INVALIDATE_BY_DESTROYING:
case INVALIDATE_BY_DESTROYING_WITH_SHUTDOWN:
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
/*
* Test that the key handle and identifier are now not refering to an
* existing key.
*/
TEST_EQUAL( psa_get_key_attributes( handle, &read_attributes ),
Update tests for other invalid key operations. Update expected return values of psa_get_key_attributes(), psa_export_key() and other key api(s) to PSA_ERROR_INVALID_HANDLE for invalid key. Signed-off-by: Maulik Patel <Maulik.Patel@arm.com>
2021-03-17 17:11:05 +01:00
PSA_ERROR_INVALID_HANDLE );
Update tests for psa_close_key for invalid key. Update expected return values of psa_close_key() to PSA_ERROR_INVALID_HANDLE for invalid key handle operations. Signed-off-by: Maulik Patel <Maulik.Patel@arm.com>
2021-03-17 16:05:13 +01:00
TEST_EQUAL( psa_close_key( handle ), PSA_ERROR_INVALID_HANDLE );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
TEST_EQUAL( psa_get_key_attributes( id, &read_attributes ),
Update tests for other invalid key operations. Update expected return values of psa_get_key_attributes(), psa_export_key() and other key api(s) to PSA_ERROR_INVALID_HANDLE for invalid key. Signed-off-by: Maulik Patel <Maulik.Patel@arm.com>
2021-03-17 17:11:05 +01:00
PSA_ERROR_INVALID_HANDLE );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
break;
}
exit:
tests: psa: Reset key attributes where needed After a call to psa_get_key_attributes() to retrieve the attributes of a key into a psa_key_attributes_t structure, a call to psa_reset_key_attributes() is mandated to free the resources that may be referenced by the psa_key_attributes_t structure. Not calling psa_reset_key_attributes() may result in a memory leak. When a test function calls psa_get_key_parameters() the associated key attributes are systematically reset in the clean-up part of the function with a comment to emphasize the need for the reset and make it more visible. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-19 17:55:23 +01:00
/*
* Key attributes may have been returned by psa_get_key_attributes()
* thus reset them as required.
*/
psa_reset_key_attributes( &attributes );
psa_reset_key_attributes( &read_attributes );
Replace all calls to mbedtls_psa_crypto_free by PSA_DONE Replace all calls to mbedtls_psa_crypto_free in tests by PSA_DONE. This is correct for most tests, because most tests close open keys. A few tests now fail; these tests need to be reviewed and switched back to mbedtls_psa_crypto_free if they genuinely expected to end with some slots still in use.
2019-05-28 15:10:21 +02:00
PSA_DONE( );
Persistent key reload: test more metadata In the tests for opening a persistent key after closing it, also read back and check the key data if permitted by policy, and the key policy.
2019-05-13 14:24:15 +02:00
mbedtls_free( reexported );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
}
/* END_CASE */
Fix the build without persistent storage Add missing guards on MBEDTLS_PSA_CRYPTO_STORAGE_C. Add test cases to test that psa_create_key and psa_open_key return NOT_SUPPORTED.
2018-12-03 18:19:39 +01:00
/* BEGIN_CASE depends_on:MBEDTLS_PSA_CRYPTO_STORAGE_C */
tests: psa: Add owner identifier as test parameter To test the proper handling of owner identifier as of key identifiers, add owner identifier(s) to tests having key identifier(s) as test parameters. Just don't do it for tests related to tests invalid values of key identifiers as there is no owner identifier invalid values. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-28 15:06:14 +02:00
void create_existent( int lifetime_arg, int owner_id_arg, int id_arg,
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
int reopen_policy_arg )
{
psa_key_lifetime_t lifetime = lifetime_arg;
tests: psa: Add owner identifier as test parameter To test the proper handling of owner identifier as of key identifiers, add owner identifier(s) to tests having key identifier(s) as test parameters. Just don't do it for tests related to tests invalid values of key identifiers as there is no owner identifier invalid values. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-28 15:06:14 +02:00
mbedtls_svc_key_id_t id = mbedtls_svc_key_id_make( owner_id_arg, id_arg );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
mbedtls_svc_key_id_t returned_id = MBEDTLS_SVC_KEY_ID_INIT;
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
psa_key_type_t type1 = PSA_KEY_TYPE_RAW_DATA;
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
const uint8_t material1[5] = "a key";
const uint8_t material2[5] = "b key";
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
size_t bits1 = PSA_BYTES_TO_BITS( sizeof( material1 ) );
uint8_t reexported[sizeof( material1 )];
size_t reexported_length;
reopen_policy_t reopen_policy = reopen_policy_arg;
Slot management tests: more robust storage purge Record what key ids have been used in a test case and purge them. The cleanup code no longer requires the key identifiers used in the tests to be in a certain small range.
2019-05-06 18:39:37 +02:00
TEST_USES_KEY_ID( id );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
PSA_ASSERT( psa_crypto_init( ) );
/* Create a key. */
Replace psa_make_key_persistent by id/lifetime setters in tests Remove all internal uses of psa_make_key_persistent.
2019-05-15 16:12:22 +02:00
psa_set_key_id( &attributes, id );
psa_set_key_lifetime( &attributes, lifetime );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_set_key_type( &attributes, type1 );
psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_EXPORT );
psa_set_key_algorithm( &attributes, 0 );
Split long lines after psa_import_key refactoring
2019-05-15 20:22:09 +02:00
PSA_ASSERT( psa_import_key( &attributes, material1, sizeof( material1 ),
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
&returned_id ) );
TEST_ASSERT( mbedtls_svc_key_id_equal( id, returned_id ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
if( reopen_policy == CLOSE_BEFORE )
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_close_key( id ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
/* Attempt to create a new key in the same slot. */
Split long lines after psa_import_key refactoring
2019-05-15 20:22:09 +02:00
TEST_EQUAL( psa_import_key( &attributes, material2, sizeof( material2 ),
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
&returned_id ),
Replace PSA error code definitions with the ones defined in PSA spec
2019-02-14 12:48:10 +01:00
PSA_ERROR_ALREADY_EXISTS );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
TEST_ASSERT( mbedtls_svc_key_id_is_null( returned_id ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
if( reopen_policy == CLOSE_AFTER )
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_close_key( id ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
/* Check that the original key hasn't changed. */
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_reset_key_attributes( &attributes );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_get_key_attributes( id, &attributes ) );
Fix PSA code and unit tests Fix PSA code and unit tests for the unit tests to pass with key identifiers encoding owner identifiers. The changes in PSA code just make the enablement of key identifiers encoding owner identifiers platform independent. Previous to this commit, such key identifiers were used only in the case of PSA SPM platforms. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-23 17:13:42 +02:00
TEST_ASSERT( mbedtls_svc_key_id_equal(
psa_get_key_id( &attributes ), id ) );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
TEST_EQUAL( psa_get_key_lifetime( &attributes ), lifetime );
TEST_EQUAL( psa_get_key_type( &attributes ), type1 );
TEST_EQUAL( psa_get_key_bits( &attributes ), bits1 );
TEST_EQUAL( psa_get_key_usage_flags( &attributes ), PSA_KEY_USAGE_EXPORT );
TEST_EQUAL( psa_get_key_algorithm( &attributes ), 0 );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_export_key( id,
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
reexported, sizeof( reexported ),
&reexported_length ) );
ASSERT_COMPARE( material1, sizeof( material1 ),
reexported, reexported_length );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_close_key( id ) );
Close or destroy keys explicitly in tests
2019-05-28 14:08:50 +02:00
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
exit:
tests: psa: Reset key attributes where needed After a call to psa_get_key_attributes() to retrieve the attributes of a key into a psa_key_attributes_t structure, a call to psa_reset_key_attributes() is mandated to free the resources that may be referenced by the psa_key_attributes_t structure. Not calling psa_reset_key_attributes() may result in a memory leak. When a test function calls psa_get_key_parameters() the associated key attributes are systematically reset in the clean-up part of the function with a comment to emphasize the need for the reset and make it more visible. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-19 17:55:23 +01:00
/*
* Key attributes may have been returned by psa_get_key_attributes()
* thus reset them as required.
*/
psa_reset_key_attributes( &attributes );
Replace all calls to mbedtls_psa_crypto_free by PSA_DONE Replace all calls to mbedtls_psa_crypto_free in tests by PSA_DONE. This is correct for most tests, because most tests close open keys. A few tests now fail; these tests need to be reviewed and switched back to mbedtls_psa_crypto_free if they genuinely expected to end with some slots still in use.
2019-05-28 15:10:21 +02:00
PSA_DONE( );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
}
/* END_CASE */
/* BEGIN_CASE */
Remove lifetime parameter from psa_open_key Change the scope of key identifiers to be global, rather than per lifetime. As a result, you now need to specify the lifetime of a key only when creating it.
2019-05-06 18:44:55 +02:00
void open_fail( int id_arg,
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
int expected_status_arg )
{
psa: Rename psa_key_file_id_t to mbedtls_svc_key_id_t With PSA crypto v1.0.0, a volatile key identifier may contain a owner identifier but no file is associated to it. Thus rename the type psa_key_file_id_t to mbedtls_svc_key_id_t to avoid a direct link with a file when a key identifier involves an owner identifier. The new type name is prefixed by mbedtls to highlight that the type is specific to Mbed TLS implementation and not defined in the PSA Cryptography API specification. The svc in the type name stands for service as this is the key identifier type from the point of view of the service providing the Cryptography services. The service can be completely provided by the present library or partially in case of a multi-client service. As a consequence rename as well: . MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER to MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER . PSA_KEY_ID_INIT to MBEDTLS_SVC_KEY_ID_INIT . PSA_KEY_FILE_GET_KEY_ID to MBEDTLS_SVC_KEY_ID_GET_KEY_ID . psa_key_file_id_make to mbedtls_svc_key_id_make Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-28 19:01:50 +02:00
mbedtls_svc_key_id_t id = mbedtls_svc_key_id_make( 1, id_arg );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
psa_status_t expected_status = expected_status_arg;
Define handles as key identifiers Define psa_key_handle_t to be equal to mbedtls_svc_key_id_t. Make the handle of a persistent key be equal to its key identifier. For volatile keys, make the key handle equal to the volatile key identifier of the created volatile key. The unit tests are modified just to make them compile not to make them run successfully. They are fixed in the subsequent commits. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-31 11:26:37 +02:00
psa_key_handle_t handle = mbedtls_svc_key_id_make( 0xdead, 0xdead );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
PSA_ASSERT( psa_crypto_init( ) );
Remove lifetime parameter from psa_open_key Change the scope of key identifiers to be global, rather than per lifetime. As a result, you now need to specify the lifetime of a key only when creating it.
2019-05-06 18:44:55 +02:00
TEST_EQUAL( psa_open_key( id, &handle ), expected_status );
Introduce psa_key_handle_is_null inline function Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-09-01 10:51:51 +02:00
TEST_ASSERT( psa_key_handle_is_null( handle ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
exit:
Replace all calls to mbedtls_psa_crypto_free by PSA_DONE Replace all calls to mbedtls_psa_crypto_free in tests by PSA_DONE. This is correct for most tests, because most tests close open keys. A few tests now fail; these tests need to be reviewed and switched back to mbedtls_psa_crypto_free if they genuinely expected to end with some slots still in use.
2019-05-28 15:10:21 +02:00
PSA_DONE( );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
}
/* END_CASE */
/* BEGIN_CASE */
void create_fail( int lifetime_arg, int id_arg,
int expected_status_arg )
{
psa_key_lifetime_t lifetime = lifetime_arg;
psa: Rename psa_key_file_id_t to mbedtls_svc_key_id_t With PSA crypto v1.0.0, a volatile key identifier may contain a owner identifier but no file is associated to it. Thus rename the type psa_key_file_id_t to mbedtls_svc_key_id_t to avoid a direct link with a file when a key identifier involves an owner identifier. The new type name is prefixed by mbedtls to highlight that the type is specific to Mbed TLS implementation and not defined in the PSA Cryptography API specification. The svc in the type name stands for service as this is the key identifier type from the point of view of the service providing the Cryptography services. The service can be completely provided by the present library or partially in case of a multi-client service. As a consequence rename as well: . MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER to MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER . PSA_KEY_ID_INIT to MBEDTLS_SVC_KEY_ID_INIT . PSA_KEY_FILE_GET_KEY_ID to MBEDTLS_SVC_KEY_ID_GET_KEY_ID . psa_key_file_id_make to mbedtls_svc_key_id_make Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-28 19:01:50 +02:00
mbedtls_svc_key_id_t id = mbedtls_svc_key_id_make( 1, id_arg );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
psa_status_t expected_status = expected_status_arg;
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
mbedtls_svc_key_id_t returned_id =
mbedtls_svc_key_id_make( 0xdead, 0xdead );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
uint8_t material[1] = {'k'};
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
Slot management tests: more robust storage purge Record what key ids have been used in a test case and purge them. The cleanup code no longer requires the key identifiers used in the tests to be in a certain small range.
2019-05-06 18:39:37 +02:00
TEST_USES_KEY_ID( id );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
PSA_ASSERT( psa_crypto_init( ) );
Replace psa_make_key_persistent by id/lifetime setters in tests Remove all internal uses of psa_make_key_persistent.
2019-05-15 16:12:22 +02:00
psa_set_key_lifetime( &attributes, lifetime );
Add key id check when creating a volatile key Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-23 17:11:13 +02:00
if( PSA_KEY_LIFETIME_IS_VOLATILE( lifetime ) )
{
/*
* Not possible to set a key identifier different from 0 through
* PSA key attributes APIs thus accessing to the attributes
* directly.
*/
attributes.core.id = id;
}
else
psa_set_key_id( &attributes, id );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_set_key_type( &attributes, PSA_KEY_TYPE_RAW_DATA );
Split long lines after psa_import_key refactoring
2019-05-15 20:22:09 +02:00
TEST_EQUAL( psa_import_key( &attributes, material, sizeof( material ),
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
&returned_id ),
Rewrap some lines after the macro changes Change the way some lines are wrapped to cut at a more logical place. This commit mainly rewrites multi-line calls to TEST_EQUAL, and also a few calls to PSA_ASSERT.
2018-12-18 00:33:25 +01:00
expected_status );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
TEST_ASSERT( mbedtls_svc_key_id_is_null( returned_id ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
exit:
Replace all calls to mbedtls_psa_crypto_free by PSA_DONE Replace all calls to mbedtls_psa_crypto_free in tests by PSA_DONE. This is correct for most tests, because most tests close open keys. A few tests now fail; these tests need to be reviewed and switched back to mbedtls_psa_crypto_free if they genuinely expected to end with some slots still in use.
2019-05-28 15:10:21 +02:00
PSA_DONE( );
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
}
/* END_CASE */
/* BEGIN_CASE */
tests: psa: Add owner identifier as test parameter To test the proper handling of owner identifier as of key identifiers, add owner identifier(s) to tests having key identifier(s) as test parameters. Just don't do it for tests related to tests invalid values of key identifiers as there is no owner identifier invalid values. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-28 15:06:14 +02:00
void copy_across_lifetimes( int source_lifetime_arg, int source_owner_id_arg,
int source_id_arg, int source_usage_arg,
Enrollment algorithm in policy: add support in psa_copy_key tests Add parameters to psa_copy_key tests for the enrollment algorithm (alg2). This commit only tests with alg2=0, which is equivalent to not setting an enrollment algorithm.
2019-05-20 17:28:11 +02:00
int source_alg_arg, int source_alg2_arg,
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
int type_arg, data_t *material,
tests: psa: Add owner identifier as test parameter To test the proper handling of owner identifier as of key identifiers, add owner identifier(s) to tests having key identifier(s) as test parameters. Just don't do it for tests related to tests invalid values of key identifiers as there is no owner identifier invalid values. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-28 15:06:14 +02:00
int target_lifetime_arg, int target_owner_id_arg,
int target_id_arg, int target_usage_arg,
Enrollment algorithm in policy: add support in psa_copy_key tests Add parameters to psa_copy_key tests for the enrollment algorithm (alg2). This commit only tests with alg2=0, which is equivalent to not setting an enrollment algorithm.
2019-05-20 17:28:11 +02:00
int target_alg_arg, int target_alg2_arg,
int expected_usage_arg,
int expected_alg_arg, int expected_alg2_arg )
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
{
psa_key_lifetime_t source_lifetime = source_lifetime_arg;
psa: Rename psa_key_file_id_t to mbedtls_svc_key_id_t With PSA crypto v1.0.0, a volatile key identifier may contain a owner identifier but no file is associated to it. Thus rename the type psa_key_file_id_t to mbedtls_svc_key_id_t to avoid a direct link with a file when a key identifier involves an owner identifier. The new type name is prefixed by mbedtls to highlight that the type is specific to Mbed TLS implementation and not defined in the PSA Cryptography API specification. The svc in the type name stands for service as this is the key identifier type from the point of view of the service providing the Cryptography services. The service can be completely provided by the present library or partially in case of a multi-client service. As a consequence rename as well: . MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER to MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER . PSA_KEY_ID_INIT to MBEDTLS_SVC_KEY_ID_INIT . PSA_KEY_FILE_GET_KEY_ID to MBEDTLS_SVC_KEY_ID_GET_KEY_ID . psa_key_file_id_make to mbedtls_svc_key_id_make Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-28 19:01:50 +02:00
mbedtls_svc_key_id_t source_id =
tests: psa: Add owner identifier as test parameter To test the proper handling of owner identifier as of key identifiers, add owner identifier(s) to tests having key identifier(s) as test parameters. Just don't do it for tests related to tests invalid values of key identifiers as there is no owner identifier invalid values. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-28 15:06:14 +02:00
mbedtls_svc_key_id_make( source_owner_id_arg, source_id_arg );
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
psa_key_usage_t source_usage = source_usage_arg;
psa_algorithm_t source_alg = source_alg_arg;
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_key_attributes_t source_attributes = PSA_KEY_ATTRIBUTES_INIT;
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
psa_key_type_t source_type = type_arg;
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
mbedtls_svc_key_id_t returned_source_id = MBEDTLS_SVC_KEY_ID_INIT;
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
psa_key_lifetime_t target_lifetime = target_lifetime_arg;
psa: Rename psa_key_file_id_t to mbedtls_svc_key_id_t With PSA crypto v1.0.0, a volatile key identifier may contain a owner identifier but no file is associated to it. Thus rename the type psa_key_file_id_t to mbedtls_svc_key_id_t to avoid a direct link with a file when a key identifier involves an owner identifier. The new type name is prefixed by mbedtls to highlight that the type is specific to Mbed TLS implementation and not defined in the PSA Cryptography API specification. The svc in the type name stands for service as this is the key identifier type from the point of view of the service providing the Cryptography services. The service can be completely provided by the present library or partially in case of a multi-client service. As a consequence rename as well: . MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER to MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER . PSA_KEY_ID_INIT to MBEDTLS_SVC_KEY_ID_INIT . PSA_KEY_FILE_GET_KEY_ID to MBEDTLS_SVC_KEY_ID_GET_KEY_ID . psa_key_file_id_make to mbedtls_svc_key_id_make Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-28 19:01:50 +02:00
mbedtls_svc_key_id_t target_id =
tests: psa: Add owner identifier as test parameter To test the proper handling of owner identifier as of key identifiers, add owner identifier(s) to tests having key identifier(s) as test parameters. Just don't do it for tests related to tests invalid values of key identifiers as there is no owner identifier invalid values. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-28 15:06:14 +02:00
mbedtls_svc_key_id_make( target_owner_id_arg, target_id_arg );
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
psa_key_usage_t target_usage = target_usage_arg;
psa_algorithm_t target_alg = target_alg_arg;
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_key_attributes_t target_attributes = PSA_KEY_ATTRIBUTES_INIT;
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
mbedtls_svc_key_id_t returned_target_id = MBEDTLS_SVC_KEY_ID_INIT;
psa_key_handle_t target_handle = PSA_KEY_HANDLE_INIT;
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
psa_key_usage_t expected_usage = expected_usage_arg;
psa_algorithm_t expected_alg = expected_alg_arg;
Enrollment algorithm in policy: add support in psa_copy_key tests Add parameters to psa_copy_key tests for the enrollment algorithm (alg2). This commit only tests with alg2=0, which is equivalent to not setting an enrollment algorithm.
2019-05-20 17:28:11 +02:00
psa_algorithm_t expected_alg2 = expected_alg2_arg;
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
uint8_t *export_buffer = NULL;
Slot management tests: more robust storage purge Record what key ids have been used in a test case and purge them. The cleanup code no longer requires the key identifiers used in the tests to be in a certain small range.
2019-05-06 18:39:37 +02:00
TEST_USES_KEY_ID( source_id );
TEST_USES_KEY_ID( target_id );
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
PSA_ASSERT( psa_crypto_init( ) );
/* Populate the source slot. */
Fix PSA code and unit tests Fix PSA code and unit tests for the unit tests to pass with key identifiers encoding owner identifiers. The changes in PSA code just make the enablement of key identifiers encoding owner identifiers platform independent. Previous to this commit, such key identifiers were used only in the case of PSA SPM platforms. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-23 17:13:42 +02:00
psa_set_key_id( &source_attributes, source_id );
psa_set_key_lifetime( &source_attributes, source_lifetime );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_set_key_type( &source_attributes, source_type );
psa_set_key_usage_flags( &source_attributes, source_usage );
psa_set_key_algorithm( &source_attributes, source_alg );
Enrollment algorithm in policy: add support in psa_copy_key tests Add parameters to psa_copy_key tests for the enrollment algorithm (alg2). This commit only tests with alg2=0, which is equivalent to not setting an enrollment algorithm.
2019-05-20 17:28:11 +02:00
psa_set_key_enrollment_algorithm( &source_attributes, source_alg2_arg );
Split long lines after psa_import_key refactoring
2019-05-15 20:22:09 +02:00
PSA_ASSERT( psa_import_key( &source_attributes,
material->x, material->len,
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
&returned_source_id ) );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
/* Update the attributes with the bit size. */
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_get_key_attributes( returned_source_id,
&source_attributes ) );
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
/* Prepare the target slot. */
Fix PSA code and unit tests Fix PSA code and unit tests for the unit tests to pass with key identifiers encoding owner identifiers. The changes in PSA code just make the enablement of key identifiers encoding owner identifiers platform independent. Previous to this commit, such key identifiers were used only in the case of PSA SPM platforms. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-23 17:13:42 +02:00
psa_set_key_id( &target_attributes, target_id );
psa_set_key_lifetime( &target_attributes, target_lifetime );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_set_key_usage_flags( &target_attributes, target_usage );
psa_set_key_algorithm( &target_attributes, target_alg );
Enrollment algorithm in policy: add support in psa_copy_key tests Add parameters to psa_copy_key tests for the enrollment algorithm (alg2). This commit only tests with alg2=0, which is equivalent to not setting an enrollment algorithm.
2019-05-20 17:28:11 +02:00
psa_set_key_enrollment_algorithm( &target_attributes, target_alg2_arg );
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
/* Copy the key. */
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_copy_key( returned_source_id,
&target_attributes, &returned_target_id ) );
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
/* Destroy the source to ensure that this doesn't affect the target. */
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_destroy_key( returned_source_id ) );
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
/* If the target key is persistent, restart the system to make
* sure that the material is still alive. */
tests: psa: Use PSA_KEY_LIFETIME_IS_VOLATILE where it should Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-19 08:44:19 +02:00
if( ! PSA_KEY_LIFETIME_IS_VOLATILE( target_lifetime ) )
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
{
Close or destroy keys explicitly in tests
2019-05-28 14:08:50 +02:00
mbedtls_psa_crypto_free( );
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
PSA_ASSERT( psa_crypto_init( ) );
Remove lifetime parameter from psa_open_key Change the scope of key identifiers to be global, rather than per lifetime. As a result, you now need to specify the lifetime of a key only when creating it.
2019-05-06 18:44:55 +02:00
PSA_ASSERT( psa_open_key( target_id, &target_handle ) );
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
}
/* Test that the target slot has the expected content. */
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_reset_key_attributes( &target_attributes );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_get_key_attributes( returned_target_id,
&target_attributes ) );
Fix PSA code and unit tests Fix PSA code and unit tests for the unit tests to pass with key identifiers encoding owner identifiers. The changes in PSA code just make the enablement of key identifiers encoding owner identifiers platform independent. Previous to this commit, such key identifiers were used only in the case of PSA SPM platforms. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-23 17:13:42 +02:00
tests: psa: Use PSA_KEY_LIFETIME_IS_VOLATILE where it should Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-19 08:44:19 +02:00
if( ! PSA_KEY_LIFETIME_IS_VOLATILE( target_lifetime ) )
Fix PSA code and unit tests Fix PSA code and unit tests for the unit tests to pass with key identifiers encoding owner identifiers. The changes in PSA code just make the enablement of key identifiers encoding owner identifiers platform independent. Previous to this commit, such key identifiers were used only in the case of PSA SPM platforms. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-23 17:13:42 +02:00
{
TEST_ASSERT( mbedtls_svc_key_id_equal(
target_id, psa_get_key_id( &target_attributes ) ) );
}
else
{
#if defined(MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER)
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
TEST_EQUAL( MBEDTLS_SVC_KEY_ID_GET_OWNER_ID( returned_target_id ),
tests: psa: Add owner identifier as test parameter To test the proper handling of owner identifier as of key identifiers, add owner identifier(s) to tests having key identifier(s) as test parameters. Just don't do it for tests related to tests invalid values of key identifiers as there is no owner identifier invalid values. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-28 15:06:14 +02:00
target_owner_id_arg );
Fix PSA code and unit tests Fix PSA code and unit tests for the unit tests to pass with key identifiers encoding owner identifiers. The changes in PSA code just make the enablement of key identifiers encoding owner identifiers platform independent. Previous to this commit, such key identifiers were used only in the case of PSA SPM platforms. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-23 17:13:42 +02:00
#endif
}
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
TEST_EQUAL( target_lifetime, psa_get_key_lifetime( &target_attributes ) );
TEST_EQUAL( source_type, psa_get_key_type( &target_attributes ) );
TEST_EQUAL( psa_get_key_bits( &source_attributes ),
psa_get_key_bits( &target_attributes ) );
TEST_EQUAL( expected_usage, psa_get_key_usage_flags( &target_attributes ) );
TEST_EQUAL( expected_alg, psa_get_key_algorithm( &target_attributes ) );
Enrollment algorithm in policy: add support in psa_copy_key tests Add parameters to psa_copy_key tests for the enrollment algorithm (alg2). This commit only tests with alg2=0, which is equivalent to not setting an enrollment algorithm.
2019-05-20 17:28:11 +02:00
TEST_EQUAL( expected_alg2,
psa_get_key_enrollment_algorithm( &target_attributes ) );
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
if( expected_usage & PSA_KEY_USAGE_EXPORT )
{
size_t length;
ASSERT_ALLOC( export_buffer, material->len );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_export_key( returned_target_id, export_buffer,
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 13:40:11 +01:00
material->len, &length ) );
ASSERT_COMPARE( material->x, material->len,
export_buffer, length );
}
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
else
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
{
size_t length;
/* Check that the key is actually non-exportable. */
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
TEST_EQUAL( psa_export_key( returned_target_id, export_buffer,
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
material->len, &length ),
PSA_ERROR_NOT_PERMITTED );
}
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_destroy_key( returned_target_id ) );
Close or destroy keys explicitly in tests
2019-05-28 14:08:50 +02:00
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
exit:
tests: psa: Reset key attributes where needed After a call to psa_get_key_attributes() to retrieve the attributes of a key into a psa_key_attributes_t structure, a call to psa_reset_key_attributes() is mandated to free the resources that may be referenced by the psa_key_attributes_t structure. Not calling psa_reset_key_attributes() may result in a memory leak. When a test function calls psa_get_key_parameters() the associated key attributes are systematically reset in the clean-up part of the function with a comment to emphasize the need for the reset and make it more visible. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-19 17:55:23 +01:00
/*
* Source and target key attributes may have been returned by
* psa_get_key_attributes() thus reset them as required.
*/
psa_reset_key_attributes( &source_attributes );
psa_reset_key_attributes( &target_attributes );
Replace all calls to mbedtls_psa_crypto_free by PSA_DONE Replace all calls to mbedtls_psa_crypto_free in tests by PSA_DONE. This is correct for most tests, because most tests close open keys. A few tests now fail; these tests need to be reviewed and switched back to mbedtls_psa_crypto_free if they genuinely expected to end with some slots still in use.
2019-05-28 15:10:21 +02:00
PSA_DONE( );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
mbedtls_free( export_buffer );
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
}
/* END_CASE */
/* BEGIN_CASE */
void copy_to_occupied( int source_lifetime_arg, int source_id_arg,
int source_usage_arg, int source_alg_arg,
int source_type_arg, data_t *source_material,
int target_lifetime_arg, int target_id_arg,
int target_usage_arg, int target_alg_arg,
int target_type_arg, data_t *target_material )
{
psa_key_lifetime_t source_lifetime = source_lifetime_arg;
psa: Rename psa_key_file_id_t to mbedtls_svc_key_id_t With PSA crypto v1.0.0, a volatile key identifier may contain a owner identifier but no file is associated to it. Thus rename the type psa_key_file_id_t to mbedtls_svc_key_id_t to avoid a direct link with a file when a key identifier involves an owner identifier. The new type name is prefixed by mbedtls to highlight that the type is specific to Mbed TLS implementation and not defined in the PSA Cryptography API specification. The svc in the type name stands for service as this is the key identifier type from the point of view of the service providing the Cryptography services. The service can be completely provided by the present library or partially in case of a multi-client service. As a consequence rename as well: . MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER to MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER . PSA_KEY_ID_INIT to MBEDTLS_SVC_KEY_ID_INIT . PSA_KEY_FILE_GET_KEY_ID to MBEDTLS_SVC_KEY_ID_GET_KEY_ID . psa_key_file_id_make to mbedtls_svc_key_id_make Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-28 19:01:50 +02:00
mbedtls_svc_key_id_t source_id =
mbedtls_svc_key_id_make( 1, source_id_arg );
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
psa_key_usage_t source_usage = source_usage_arg;
psa_algorithm_t source_alg = source_alg_arg;
psa_key_type_t source_type = source_type_arg;
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
mbedtls_svc_key_id_t returned_source_id = MBEDTLS_SVC_KEY_ID_INIT;
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
psa_key_lifetime_t target_lifetime = target_lifetime_arg;
psa: Rename psa_key_file_id_t to mbedtls_svc_key_id_t With PSA crypto v1.0.0, a volatile key identifier may contain a owner identifier but no file is associated to it. Thus rename the type psa_key_file_id_t to mbedtls_svc_key_id_t to avoid a direct link with a file when a key identifier involves an owner identifier. The new type name is prefixed by mbedtls to highlight that the type is specific to Mbed TLS implementation and not defined in the PSA Cryptography API specification. The svc in the type name stands for service as this is the key identifier type from the point of view of the service providing the Cryptography services. The service can be completely provided by the present library or partially in case of a multi-client service. As a consequence rename as well: . MBEDTLS_PSA_CRYPTO_KEY_FILE_ID_ENCODES_OWNER to MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER . PSA_KEY_ID_INIT to MBEDTLS_SVC_KEY_ID_INIT . PSA_KEY_FILE_GET_KEY_ID to MBEDTLS_SVC_KEY_ID_GET_KEY_ID . psa_key_file_id_make to mbedtls_svc_key_id_make Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-28 19:01:50 +02:00
mbedtls_svc_key_id_t target_id =
mbedtls_svc_key_id_make( 1, target_id_arg );
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
psa_key_usage_t target_usage = target_usage_arg;
psa_algorithm_t target_alg = target_alg_arg;
psa_key_type_t target_type = target_type_arg;
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
mbedtls_svc_key_id_t returned_target_id = MBEDTLS_SVC_KEY_ID_INIT;
mbedtls_svc_key_id_t new_key = MBEDTLS_SVC_KEY_ID_INIT;
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
uint8_t *export_buffer = NULL;
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
psa_key_attributes_t attributes1 = PSA_KEY_ATTRIBUTES_INIT;
psa_key_attributes_t attributes2 = PSA_KEY_ATTRIBUTES_INIT;
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
Slot management tests: more robust storage purge Record what key ids have been used in a test case and purge them. The cleanup code no longer requires the key identifiers used in the tests to be in a certain small range.
2019-05-06 18:39:37 +02:00
TEST_USES_KEY_ID( source_id );
TEST_USES_KEY_ID( target_id );
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
PSA_ASSERT( psa_crypto_init( ) );
/* Populate the source slot. */
tests: psa: Use PSA_KEY_LIFETIME_IS_VOLATILE where it should Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-19 08:44:19 +02:00
if( ! PSA_KEY_LIFETIME_IS_VOLATILE( source_lifetime ) )
Replace psa_make_key_persistent by id/lifetime setters in tests Remove all internal uses of psa_make_key_persistent.
2019-05-15 16:12:22 +02:00
{
psa_set_key_id( &attributes, source_id );
psa_set_key_lifetime( &attributes, source_lifetime );
}
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_set_key_type( &attributes, source_type );
psa_set_key_usage_flags( &attributes, source_usage );
psa_set_key_algorithm( &attributes, source_alg );
Split long lines after psa_import_key refactoring
2019-05-15 20:22:09 +02:00
PSA_ASSERT( psa_import_key( &attributes,
source_material->x, source_material->len,
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
&returned_source_id ) );
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
/* Populate the target slot. */
Fix PSA code and unit tests Fix PSA code and unit tests for the unit tests to pass with key identifiers encoding owner identifiers. The changes in PSA code just make the enablement of key identifiers encoding owner identifiers platform independent. Previous to this commit, such key identifiers were used only in the case of PSA SPM platforms. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-23 17:13:42 +02:00
if( mbedtls_svc_key_id_equal( target_id, source_id ) )
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
{
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
returned_target_id = returned_source_id;
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
}
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
else
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
{
Replace psa_make_key_persistent by id/lifetime setters in tests Remove all internal uses of psa_make_key_persistent.
2019-05-15 16:12:22 +02:00
psa_set_key_id( &attributes1, target_id );
psa_set_key_lifetime( &attributes1, target_lifetime );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_set_key_type( &attributes1, target_type );
psa_set_key_usage_flags( &attributes1, target_usage );
psa_set_key_algorithm( &attributes1, target_alg );
Split long lines after psa_import_key refactoring
2019-05-15 20:22:09 +02:00
PSA_ASSERT( psa_import_key( &attributes1,
target_material->x, target_material->len,
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
&returned_target_id ) );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
}
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_get_key_attributes( returned_target_id, &attributes1 ) );
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
/* Make a copy attempt. */
Replace psa_make_key_persistent by id/lifetime setters in tests Remove all internal uses of psa_make_key_persistent.
2019-05-15 16:12:22 +02:00
psa_set_key_id( &attributes, target_id );
psa_set_key_lifetime( &attributes, target_lifetime );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
TEST_EQUAL( psa_copy_key( returned_source_id,
&attributes, &new_key ),
Replace PSA error code definitions with the ones defined in PSA spec
2019-02-14 12:48:10 +01:00
PSA_ERROR_ALREADY_EXISTS );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
TEST_ASSERT( mbedtls_svc_key_id_is_null( new_key ) );
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
/* Test that the target slot is unaffected. */
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_get_key_attributes( returned_target_id, &attributes2 ) );
Fix PSA code and unit tests Fix PSA code and unit tests for the unit tests to pass with key identifiers encoding owner identifiers. The changes in PSA code just make the enablement of key identifiers encoding owner identifiers platform independent. Previous to this commit, such key identifiers were used only in the case of PSA SPM platforms. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-23 17:13:42 +02:00
TEST_ASSERT( mbedtls_svc_key_id_equal(
psa_get_key_id( &attributes1 ),
psa_get_key_id( &attributes2 ) ) );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
TEST_EQUAL( psa_get_key_lifetime( &attributes1 ),
psa_get_key_lifetime( &attributes2 ) );
TEST_EQUAL( psa_get_key_type( &attributes1 ),
psa_get_key_type( &attributes2 ) );
TEST_EQUAL( psa_get_key_bits( &attributes1 ),
psa_get_key_bits( &attributes2 ) );
TEST_EQUAL( psa_get_key_usage_flags( &attributes1 ),
psa_get_key_usage_flags( &attributes2 ) );
TEST_EQUAL( psa_get_key_algorithm( &attributes1 ),
psa_get_key_algorithm( &attributes2 ) );
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
if( target_usage & PSA_KEY_USAGE_EXPORT )
{
size_t length;
ASSERT_ALLOC( export_buffer, target_material->len );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_export_key( returned_target_id, export_buffer,
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
target_material->len, &length ) );
ASSERT_COMPARE( target_material->x, target_material->len,
export_buffer, length );
}
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_destroy_key( returned_source_id ) );
if( ! mbedtls_svc_key_id_equal( target_id, source_id ) )
PSA_ASSERT( psa_destroy_key( returned_target_id ) );
Close or destroy keys explicitly in tests
2019-05-28 14:08:50 +02:00
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
exit:
tests: psa: Reset key attributes where needed After a call to psa_get_key_attributes() to retrieve the attributes of a key into a psa_key_attributes_t structure, a call to psa_reset_key_attributes() is mandated to free the resources that may be referenced by the psa_key_attributes_t structure. Not calling psa_reset_key_attributes() may result in a memory leak. When a test function calls psa_get_key_parameters() the associated key attributes are systematically reset in the clean-up part of the function with a comment to emphasize the need for the reset and make it more visible. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-19 17:55:23 +01:00
/*
* Key attributes may have been returned by psa_get_key_attributes()
* thus reset them as required.
*/
psa_reset_key_attributes( &attributes1 );
psa_reset_key_attributes( &attributes2 );
Replace all calls to mbedtls_psa_crypto_free by PSA_DONE Replace all calls to mbedtls_psa_crypto_free in tests by PSA_DONE. This is correct for most tests, because most tests close open keys. A few tests now fail; these tests need to be reviewed and switched back to mbedtls_psa_crypto_free if they genuinely expected to end with some slots still in use.
2019-05-28 15:10:21 +02:00
PSA_DONE( );
Test psa_copy_key Split the testing into tests that exercise policies in test_suite_psa_crypto and tests that exercise slot content (slot states, key material) in test_suite_psa_crypto_slot_management. Test various cases of source and target policies with and without wildcards. Missing: testing of the policy constraint on psa_copy_key itself. Test several key types (raw data, AES, RSA). Test with the source or target being persistent. Add failure tests (incompatible policies, source slot empty, target slot occupied).
2019-01-28 13:03:09 +01:00
mbedtls_free( export_buffer );
}
/* END_CASE */
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
/* BEGIN_CASE */
Consolidate invalid-handle tests Consolidate the invalid-handle tests from test_suite_psa_crypto and test_suite_psa_crypto_slot_management. Start with the code in test_suite_psa_crypto_slot_management and adapt it to test one invalid handle value per run of the test function.
2019-10-11 11:44:48 +02:00
void invalid_handle( int handle_construction,
Update tests for other invalid key operations. Update expected return values of psa_get_key_attributes(), psa_export_key() and other key api(s) to PSA_ERROR_INVALID_HANDLE for invalid key. Signed-off-by: Maulik Patel <Maulik.Patel@arm.com>
2021-03-17 17:11:05 +01:00
int close_status_arg )
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
{
Introduce PSA_KEY_HANDLE_INIT macro Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-30 17:48:03 +02:00
psa_key_handle_t valid_handle = PSA_KEY_HANDLE_INIT;
psa_key_handle_t invalid_handle = PSA_KEY_HANDLE_INIT;
Define handles as key identifiers Define psa_key_handle_t to be equal to mbedtls_svc_key_id_t. Make the handle of a persistent key be equal to its key identifier. For volatile keys, make the key handle equal to the volatile key identifier of the created volatile key. The unit tests are modified just to make them compile not to make them run successfully. They are fixed in the subsequent commits. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-31 11:26:37 +02:00
psa_key_id_t key_id;
Consolidate invalid-handle tests Consolidate the invalid-handle tests from test_suite_psa_crypto and test_suite_psa_crypto_slot_management. Start with the code in test_suite_psa_crypto_slot_management and adapt it to test one invalid handle value per run of the test function.
2019-10-11 11:44:48 +02:00
psa_status_t close_status = close_status_arg;
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
uint8_t material[1] = "a";
PSA_ASSERT( psa_crypto_init( ) );
/* Allocate a handle and store a key in it. */
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_set_key_type( &attributes, PSA_KEY_TYPE_RAW_DATA );
psa_set_key_usage_flags( &attributes, 0 );
psa_set_key_algorithm( &attributes, 0 );
Split long lines after psa_import_key refactoring
2019-05-15 20:22:09 +02:00
PSA_ASSERT( psa_import_key( &attributes,
material, sizeof( material ),
Consolidate invalid-handle tests Consolidate the invalid-handle tests from test_suite_psa_crypto and test_suite_psa_crypto_slot_management. Start with the code in test_suite_psa_crypto_slot_management and adapt it to test one invalid handle value per run of the test function.
2019-10-11 11:44:48 +02:00
&valid_handle ) );
Introduce psa_key_handle_is_null inline function Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-09-01 10:51:51 +02:00
TEST_ASSERT( ! psa_key_handle_is_null( valid_handle ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
Consolidate invalid-handle tests Consolidate the invalid-handle tests from test_suite_psa_crypto and test_suite_psa_crypto_slot_management. Start with the code in test_suite_psa_crypto_slot_management and adapt it to test one invalid handle value per run of the test function.
2019-10-11 11:44:48 +02:00
/* Construct an invalid handle as specified in the test case data. */
switch( handle_construction )
Update slot management tests now that {close,destroy}_key(0) succeed
2019-10-09 16:23:49 +02:00
{
Consolidate invalid-handle tests Consolidate the invalid-handle tests from test_suite_psa_crypto and test_suite_psa_crypto_slot_management. Start with the code in test_suite_psa_crypto_slot_management and adapt it to test one invalid handle value per run of the test function.
2019-10-11 11:44:48 +02:00
case INVALID_HANDLE_0:
Introduce PSA_KEY_HANDLE_INIT macro Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-30 17:48:03 +02:00
invalid_handle = PSA_KEY_HANDLE_INIT;
Consolidate invalid-handle tests Consolidate the invalid-handle tests from test_suite_psa_crypto and test_suite_psa_crypto_slot_management. Start with the code in test_suite_psa_crypto_slot_management and adapt it to test one invalid handle value per run of the test function.
2019-10-11 11:44:48 +02:00
break;
case INVALID_HANDLE_UNOPENED:
Define handles as key identifiers Define psa_key_handle_t to be equal to mbedtls_svc_key_id_t. Make the handle of a persistent key be equal to its key identifier. For volatile keys, make the key handle equal to the volatile key identifier of the created volatile key. The unit tests are modified just to make them compile not to make them run successfully. They are fixed in the subsequent commits. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-31 11:26:37 +02:00
/*
* MBEDTLS_SVC_KEY_ID_GET_KEY_ID( valid_handle ) is a volatile
* key identifier as the imported key is a volatile key. Volatile
* key identifiers are in the range from PSA_KEY_ID_VOLATILE_MIN
* to PSA_KEY_ID_VOLATILE_MAX included. Thus pick a key identifier
* in the range from PSA_KEY_ID_VOLATILE_MIN to
* PSA_KEY_ID_VOLATILE_MAX different from
* MBEDTLS_SVC_KEY_ID_GET_KEY_ID( valid_handle ) to build an
* unopened and thus invalid identifier.
*/
if( MBEDTLS_SVC_KEY_ID_GET_KEY_ID( valid_handle ) ==
PSA_KEY_ID_VOLATILE_MIN )
key_id = PSA_KEY_ID_VOLATILE_MIN + 1;
Consolidate invalid-handle tests Consolidate the invalid-handle tests from test_suite_psa_crypto and test_suite_psa_crypto_slot_management. Start with the code in test_suite_psa_crypto_slot_management and adapt it to test one invalid handle value per run of the test function.
2019-10-11 11:44:48 +02:00
else
Define handles as key identifiers Define psa_key_handle_t to be equal to mbedtls_svc_key_id_t. Make the handle of a persistent key be equal to its key identifier. For volatile keys, make the key handle equal to the volatile key identifier of the created volatile key. The unit tests are modified just to make them compile not to make them run successfully. They are fixed in the subsequent commits. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-31 11:26:37 +02:00
key_id = MBEDTLS_SVC_KEY_ID_GET_KEY_ID( valid_handle ) - 1;
invalid_handle =
mbedtls_svc_key_id_make( 0, key_id );
Consolidate invalid-handle tests Consolidate the invalid-handle tests from test_suite_psa_crypto and test_suite_psa_crypto_slot_management. Start with the code in test_suite_psa_crypto_slot_management and adapt it to test one invalid handle value per run of the test function.
2019-10-11 11:44:48 +02:00
break;
case INVALID_HANDLE_CLOSED:
PSA_ASSERT( psa_import_key( &attributes,
material, sizeof( material ),
&invalid_handle ) );
PSA_ASSERT( psa_destroy_key( invalid_handle ) );
break;
case INVALID_HANDLE_HUGE:
Define handles as key identifiers Define psa_key_handle_t to be equal to mbedtls_svc_key_id_t. Make the handle of a persistent key be equal to its key identifier. For volatile keys, make the key handle equal to the volatile key identifier of the created volatile key. The unit tests are modified just to make them compile not to make them run successfully. They are fixed in the subsequent commits. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-31 11:26:37 +02:00
invalid_handle =
mbedtls_svc_key_id_make( 0, PSA_KEY_ID_VENDOR_MAX + 1 );
Consolidate invalid-handle tests Consolidate the invalid-handle tests from test_suite_psa_crypto and test_suite_psa_crypto_slot_management. Start with the code in test_suite_psa_crypto_slot_management and adapt it to test one invalid handle value per run of the test function.
2019-10-11 11:44:48 +02:00
break;
default:
TEST_ASSERT( ! "unknown handle construction" );
Update slot management tests now that {close,destroy}_key(0) succeed
2019-10-09 16:23:49 +02:00
}
Consolidate invalid-handle tests Consolidate the invalid-handle tests from test_suite_psa_crypto and test_suite_psa_crypto_slot_management. Start with the code in test_suite_psa_crypto_slot_management and adapt it to test one invalid handle value per run of the test function.
2019-10-11 11:44:48 +02:00
/* Attempt to use the invalid handle. */
TEST_EQUAL( psa_get_key_attributes( invalid_handle, &attributes ),
Update tests for other invalid key operations. Update expected return values of psa_get_key_attributes(), psa_export_key() and other key api(s) to PSA_ERROR_INVALID_HANDLE for invalid key. Signed-off-by: Maulik Patel <Maulik.Patel@arm.com>
2021-03-17 17:11:05 +01:00
PSA_ERROR_INVALID_HANDLE );
Consolidate invalid-handle tests Consolidate the invalid-handle tests from test_suite_psa_crypto and test_suite_psa_crypto_slot_management. Start with the code in test_suite_psa_crypto_slot_management and adapt it to test one invalid handle value per run of the test function.
2019-10-11 11:44:48 +02:00
TEST_EQUAL( psa_close_key( invalid_handle ), close_status );
TEST_EQUAL( psa_destroy_key( invalid_handle ), close_status );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
/* After all this, check that the original handle is intact. */
Consolidate invalid-handle tests Consolidate the invalid-handle tests from test_suite_psa_crypto and test_suite_psa_crypto_slot_management. Start with the code in test_suite_psa_crypto_slot_management and adapt it to test one invalid handle value per run of the test function.
2019-10-11 11:44:48 +02:00
PSA_ASSERT( psa_get_key_attributes( valid_handle, &attributes ) );
Convert remaining obsolete function call
2019-05-27 14:53:07 +02:00
TEST_EQUAL( psa_get_key_type( &attributes ), PSA_KEY_TYPE_RAW_DATA );
TEST_EQUAL( psa_get_key_bits( &attributes ),
PSA_BYTES_TO_BITS( sizeof( material ) ) );
Consolidate invalid-handle tests Consolidate the invalid-handle tests from test_suite_psa_crypto and test_suite_psa_crypto_slot_management. Start with the code in test_suite_psa_crypto_slot_management and adapt it to test one invalid handle value per run of the test function.
2019-10-11 11:44:48 +02:00
PSA_ASSERT( psa_close_key( valid_handle ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
exit:
tests: psa: Reset key attributes where needed After a call to psa_get_key_attributes() to retrieve the attributes of a key into a psa_key_attributes_t structure, a call to psa_reset_key_attributes() is mandated to free the resources that may be referenced by the psa_key_attributes_t structure. Not calling psa_reset_key_attributes() may result in a memory leak. When a test function calls psa_get_key_parameters() the associated key attributes are systematically reset in the clean-up part of the function with a comment to emphasize the need for the reset and make it more visible. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-19 17:55:23 +01:00
/*
* Key attributes may have been returned by psa_get_key_attributes()
* thus reset them as required.
*/
psa_reset_key_attributes( &attributes );
Replace all calls to mbedtls_psa_crypto_free by PSA_DONE Replace all calls to mbedtls_psa_crypto_free in tests by PSA_DONE. This is correct for most tests, because most tests close open keys. A few tests now fail; these tests need to be reviewed and switched back to mbedtls_psa_crypto_free if they genuinely expected to end with some slots still in use.
2019-05-28 15:10:21 +02:00
PSA_DONE( );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
}
/* END_CASE */
/* BEGIN_CASE */
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
void many_transient_keys( int max_keys_arg )
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
{
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
mbedtls_svc_key_id_t *keys = NULL;
size_t max_keys = max_keys_arg;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
size_t i, j;
psa_status_t status;
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
uint8_t exported[sizeof( size_t )];
size_t exported_length;
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
ASSERT_ALLOC( keys, max_keys );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
PSA_ASSERT( psa_crypto_init( ) );
Update key management tests to use attributes Remove test cases which are no longer relevant because they involve a slot which is allocated but not filled with key material.
2019-04-19 18:20:30 +02:00
psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_EXPORT );
psa_set_key_algorithm( &attributes, 0 );
psa_set_key_type( &attributes, PSA_KEY_TYPE_RAW_DATA );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
for( i = 0; i < max_keys; i++ )
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
{
Put handle parameter last: psa_import_key In psa_import_key, change the order of parameters to pass the pointer where the newly created handle will be stored last. This is consistent with most other library functions that put inputs before outputs.
2019-05-15 20:15:10 +02:00
status = psa_import_key( &attributes,
(uint8_t *) &i, sizeof( i ),
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
&keys[i] );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
if( status == PSA_ERROR_INSUFFICIENT_MEMORY )
break;
Use PSA_ASSERT(a) in preference to TEST_ASSERT(a==PSA_SUCCESS) This commit is the result of the following command, followed by reindenting (but not wrapping lines): perl -00 -i -pe 's/^( *)TEST_ASSERT\(([^;=]*)(?: |\n *)==\s*PSA_SUCCESS\s*\);$/${1}PSA_ASSERT($2 );/gm' tests/suites/test_suite_psa_*.function
2018-12-18 00:18:46 +01:00
PSA_ASSERT( status );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
TEST_ASSERT( ! mbedtls_svc_key_id_is_null( keys[i] ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
for( j = 0; j < i; j++ )
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
TEST_ASSERT( ! mbedtls_svc_key_id_equal( keys[i], keys[j] ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
}
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
max_keys = i;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
for( i = 1; i < max_keys; i++ )
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
{
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_close_key( keys[i - 1] ) );
PSA_ASSERT( psa_export_key( keys[i],
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
exported, sizeof( exported ),
&exported_length ) );
ASSERT_COMPARE( exported, exported_length,
(uint8_t *) &i, sizeof( i ) );
}
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
PSA_ASSERT( psa_close_key( keys[i - 1] ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
exit:
Replace all calls to mbedtls_psa_crypto_free by PSA_DONE Replace all calls to mbedtls_psa_crypto_free in tests by PSA_DONE. This is correct for most tests, because most tests close open keys. A few tests now fail; these tests need to be reviewed and switched back to mbedtls_psa_crypto_free if they genuinely expected to end with some slots still in use.
2019-05-28 15:10:21 +02:00
PSA_DONE( );
tests: Adapt PSA tests to openless APIs psa_key_handle_equal() is removed as not used anymore. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-08-04 14:58:35 +02:00
mbedtls_free( keys );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 18:53:28 +01:00
}
/* END_CASE */
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
/* BEGIN_CASE depends_on:MBEDTLS_PSA_CRYPTO_STORAGE_C */
void key_slot_eviction_to_import_new_key( int lifetime_arg )
{
psa_key_lifetime_t lifetime = (psa_key_lifetime_t)lifetime_arg;
size_t i;
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
uint8_t exported[sizeof( size_t )];
size_t exported_length;
mbedtls_svc_key_id_t key, returned_key_id;
PSA_ASSERT( psa_crypto_init( ) );
psa_set_key_usage_flags( &attributes, PSA_KEY_USAGE_EXPORT );
psa_set_key_algorithm( &attributes, 0 );
psa_set_key_type( &attributes, PSA_KEY_TYPE_RAW_DATA );
/*
Rename PSA_KEY_SLOT_COUNT to MBEDTLS_PSA_KEY_SLOT_COUNT Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
2021-02-15 14:03:19 +01:00
* Create MBEDTLS_PSA_KEY_SLOT_COUNT persistent keys.
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
*/
Rename PSA_KEY_SLOT_COUNT to MBEDTLS_PSA_KEY_SLOT_COUNT Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
2021-02-15 14:03:19 +01:00
for( i = 0; i < MBEDTLS_PSA_KEY_SLOT_COUNT; i++ )
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
{
key = mbedtls_svc_key_id_make( i, i + 1 );
psa_set_key_id( &attributes, key );
PSA_ASSERT( psa_import_key( &attributes,
(uint8_t *) &i, sizeof( i ),
&returned_key_id ) );
TEST_ASSERT( mbedtls_svc_key_id_equal( returned_key_id, key ) );
}
/*
* Create a new persistent or volatile key. When creating the key,
Improve/fix documentation Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-18 17:21:22 +01:00
* one of the descriptions of the previously created persistent keys
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
* is removed from the RAM key slots. This makes room to store its
* description in RAM.
*/
Rename PSA_KEY_SLOT_COUNT to MBEDTLS_PSA_KEY_SLOT_COUNT Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
2021-02-15 14:03:19 +01:00
i = MBEDTLS_PSA_KEY_SLOT_COUNT;
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
key = mbedtls_svc_key_id_make( i, i + 1 );
psa_set_key_id( &attributes, key );
tests: slot mgmt: Improve key_slot_eviction_to_import_new_key test Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-14 14:19:11 +01:00
psa_set_key_lifetime( &attributes, lifetime );
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
PSA_ASSERT( psa_import_key( &attributes,
(uint8_t *) &i, sizeof( i ),
&returned_key_id ) );
if( lifetime != PSA_KEY_LIFETIME_VOLATILE )
TEST_ASSERT( mbedtls_svc_key_id_equal( returned_key_id, key ) );
tests: slot mgmt: Improve key_slot_eviction_to_import_new_key test Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-14 14:19:11 +01:00
else
TEST_ASSERT( psa_key_id_is_volatile(
MBEDTLS_SVC_KEY_ID_GET_KEY_ID( returned_key_id ) ) );
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
/*
Rename PSA_KEY_SLOT_COUNT to MBEDTLS_PSA_KEY_SLOT_COUNT Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
2021-02-15 14:03:19 +01:00
* Check that we can export all ( MBEDTLS_PSA_KEY_SLOT_COUNT + 1 ) keys,
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
* that they have the expected value and destroy them. In that process,
* the description of the persistent key that was evicted from the RAM
* slots when creating the last key is restored in a RAM slot to export
* its value.
*/
Rename PSA_KEY_SLOT_COUNT to MBEDTLS_PSA_KEY_SLOT_COUNT Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
2021-02-15 14:03:19 +01:00
for( i = 0; i <= MBEDTLS_PSA_KEY_SLOT_COUNT; i++ )
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
{
Rename PSA_KEY_SLOT_COUNT to MBEDTLS_PSA_KEY_SLOT_COUNT Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
2021-02-15 14:03:19 +01:00
if( i < MBEDTLS_PSA_KEY_SLOT_COUNT )
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
key = mbedtls_svc_key_id_make( i, i + 1 );
else
key = returned_key_id;
PSA_ASSERT( psa_export_key( key,
exported, sizeof( exported ),
&exported_length ) );
ASSERT_COMPARE( exported, exported_length,
(uint8_t *) &i, sizeof( i ) );
PSA_ASSERT( psa_destroy_key( key ) );
}
exit:
PSA_DONE( );
}
/* END_CASE */
/* BEGIN_CASE depends_on:MBEDTLS_PSA_CRYPTO_STORAGE_C */
void non_reusable_key_slots_integrity_in_case_of_key_slot_starvation( )
{
psa_status_t status;
size_t i;
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
uint8_t exported[sizeof( size_t )];
size_t exported_length;
Prefer persistent over permanent For consistency across the code base, prefer persistent over permanent to qualify a key stored in persistent storage. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 18:08:03 +01:00
mbedtls_svc_key_id_t persistent_key = MBEDTLS_SVC_KEY_ID_INIT;
mbedtls_svc_key_id_t persistent_key2 = MBEDTLS_SVC_KEY_ID_INIT;
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
mbedtls_svc_key_id_t returned_key_id = MBEDTLS_SVC_KEY_ID_INIT;
mbedtls_svc_key_id_t *keys = NULL;
Rename PSA_KEY_SLOT_COUNT to MBEDTLS_PSA_KEY_SLOT_COUNT Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
2021-02-15 14:03:19 +01:00
TEST_ASSERT( MBEDTLS_PSA_KEY_SLOT_COUNT >= 1 );
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
Rename PSA_KEY_SLOT_COUNT to MBEDTLS_PSA_KEY_SLOT_COUNT Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
2021-02-15 14:03:19 +01:00
ASSERT_ALLOC( keys, MBEDTLS_PSA_KEY_SLOT_COUNT );
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
PSA_ASSERT( psa_crypto_init( ) );
psa_set_key_usage_flags( &attributes,
PSA_KEY_USAGE_EXPORT | PSA_KEY_USAGE_COPY );
psa_set_key_algorithm( &attributes, 0 );
psa_set_key_type( &attributes, PSA_KEY_TYPE_RAW_DATA );
/*
Prefer persistent over permanent For consistency across the code base, prefer persistent over permanent to qualify a key stored in persistent storage. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 18:08:03 +01:00
* Create a persistent key
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
*/
Prefer persistent over permanent For consistency across the code base, prefer persistent over permanent to qualify a key stored in persistent storage. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 18:08:03 +01:00
persistent_key = mbedtls_svc_key_id_make( 0x100, 0x205 );
psa_set_key_id( &attributes, persistent_key );
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
PSA_ASSERT( psa_import_key( &attributes,
Prefer persistent over permanent For consistency across the code base, prefer persistent over permanent to qualify a key stored in persistent storage. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 18:08:03 +01:00
(uint8_t *) &persistent_key,
sizeof( persistent_key ),
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
&returned_key_id ) );
Prefer persistent over permanent For consistency across the code base, prefer persistent over permanent to qualify a key stored in persistent storage. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 18:08:03 +01:00
TEST_ASSERT( mbedtls_svc_key_id_equal( returned_key_id, persistent_key ) );
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
/*
Rename PSA_KEY_SLOT_COUNT to MBEDTLS_PSA_KEY_SLOT_COUNT Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
2021-02-15 14:03:19 +01:00
* Create MBEDTLS_PSA_KEY_SLOT_COUNT volatile keys
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
*/
psa_set_key_lifetime( &attributes, PSA_KEY_LIFETIME_VOLATILE );
Rename PSA_KEY_SLOT_COUNT to MBEDTLS_PSA_KEY_SLOT_COUNT Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
2021-02-15 14:03:19 +01:00
for( i = 0; i < MBEDTLS_PSA_KEY_SLOT_COUNT; i++ )
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
{
PSA_ASSERT( psa_import_key( &attributes,
(uint8_t *) &i, sizeof( i ),
&keys[i]) );
}
psa_reset_key_attributes( &attributes );
/*
* Check that we cannot access the persistent key as all slots are
* occupied by volatile keys and the implementation needs to load the
* persistent key description in a slot to be able to access it.
*/
Prefer persistent over permanent For consistency across the code base, prefer persistent over permanent to qualify a key stored in persistent storage. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 18:08:03 +01:00
status = psa_get_key_attributes( persistent_key, &attributes );
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
TEST_EQUAL( status, PSA_ERROR_INSUFFICIENT_MEMORY );
/*
* Check we can export the volatile key created last and that it has the
* expected value. Then, destroy it.
*/
Rename PSA_KEY_SLOT_COUNT to MBEDTLS_PSA_KEY_SLOT_COUNT Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
2021-02-15 14:03:19 +01:00
PSA_ASSERT( psa_export_key( keys[MBEDTLS_PSA_KEY_SLOT_COUNT - 1],
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
exported, sizeof( exported ),
&exported_length ) );
Rename PSA_KEY_SLOT_COUNT to MBEDTLS_PSA_KEY_SLOT_COUNT Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
2021-02-15 14:03:19 +01:00
i = MBEDTLS_PSA_KEY_SLOT_COUNT - 1;
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
ASSERT_COMPARE( exported, exported_length, (uint8_t *) &i, sizeof( i ) );
Rename PSA_KEY_SLOT_COUNT to MBEDTLS_PSA_KEY_SLOT_COUNT Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
2021-02-15 14:03:19 +01:00
PSA_ASSERT( psa_destroy_key( keys[MBEDTLS_PSA_KEY_SLOT_COUNT - 1] ) );
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
/*
* Check that we can now access the persistent key again.
*/
Prefer persistent over permanent For consistency across the code base, prefer persistent over permanent to qualify a key stored in persistent storage. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 18:08:03 +01:00
PSA_ASSERT( psa_get_key_attributes( persistent_key, &attributes ) );
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
TEST_ASSERT( mbedtls_svc_key_id_equal( attributes.core.id,
Prefer persistent over permanent For consistency across the code base, prefer persistent over permanent to qualify a key stored in persistent storage. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 18:08:03 +01:00
persistent_key ) );
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
/*
* Check that we cannot copy the persistent key as all slots are occupied
Prefer persistent over permanent For consistency across the code base, prefer persistent over permanent to qualify a key stored in persistent storage. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 18:08:03 +01:00
* by the persistent key and the volatile keys and the slot containing the
* persistent key cannot be reclaimed as it contains the key to copy.
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
*/
Prefer persistent over permanent For consistency across the code base, prefer persistent over permanent to qualify a key stored in persistent storage. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 18:08:03 +01:00
persistent_key2 = mbedtls_svc_key_id_make( 0x100, 0x204 );
psa_set_key_id( &attributes, persistent_key2 );
status = psa_copy_key( persistent_key, &attributes, &returned_key_id );
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
TEST_EQUAL( status, PSA_ERROR_INSUFFICIENT_MEMORY );
/*
* Check we can export the remaining volatile keys and that they have the
* expected values.
*/
Rename PSA_KEY_SLOT_COUNT to MBEDTLS_PSA_KEY_SLOT_COUNT Signed-off-by: Steven Cooreman <steven.cooreman@silabs.com>
2021-02-15 14:03:19 +01:00
for( i = 0; i < ( MBEDTLS_PSA_KEY_SLOT_COUNT - 1 ); i++ )
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
{
PSA_ASSERT( psa_export_key( keys[i],
exported, sizeof( exported ),
&exported_length ) );
ASSERT_COMPARE( exported, exported_length,
(uint8_t *) &i, sizeof( i ) );
PSA_ASSERT( psa_destroy_key( keys[i] ) );
}
/*
* Check we can export the persistent key and that it have the expected
* value.
*/
Prefer persistent over permanent For consistency across the code base, prefer persistent over permanent to qualify a key stored in persistent storage. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 18:08:03 +01:00
PSA_ASSERT( psa_export_key( persistent_key, exported, sizeof( exported ),
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
&exported_length ) );
ASSERT_COMPARE( exported, exported_length,
Prefer persistent over permanent For consistency across the code base, prefer persistent over permanent to qualify a key stored in persistent storage. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 18:08:03 +01:00
(uint8_t *) &persistent_key, sizeof( persistent_key ) );
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
exit:
tests: psa: Reset key attributes where needed After a call to psa_get_key_attributes() to retrieve the attributes of a key into a psa_key_attributes_t structure, a call to psa_reset_key_attributes() is mandated to free the resources that may be referenced by the psa_key_attributes_t structure. Not calling psa_reset_key_attributes() may result in a memory leak. When a test function calls psa_get_key_parameters() the associated key attributes are systematically reset in the clean-up part of the function with a comment to emphasize the need for the reset and make it more visible. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-19 17:55:23 +01:00
/*
* Key attributes may have been returned by psa_get_key_attributes()
* thus reset them as required.
*/
psa_reset_key_attributes( &attributes );
Prefer persistent over permanent For consistency across the code base, prefer persistent over permanent to qualify a key stored in persistent storage. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-11-10 18:08:03 +01:00
psa_destroy_key( persistent_key );
psa: mgmt: Add key slot reuse When looking for an empty key slot to store the description of a key, if all key slots are in use, reuse the first encountered and unaccessed key slot containing the description of a permanent key. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-10-21 09:04:34 +02:00
PSA_DONE( );
mbedtls_free( keys );
}
/* END_CASE */
Reference in a new issue Copy permalink