yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-12-27 02:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
mbedtls/tests/suites/test_suite_psa_crypto_slot_management.function

801 lines
30 KiB
Plaintext
Raw Normal View History

Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
/* BEGIN_HEADER */
#include <stdint.h>
tests: Create an include folder Create an include folder dedicated to include files for tests. With the upcoming work on tests for PSA crypto drivers the number of includes specific to tests is going to increase significantly thus create a dedicated folder. Don't put the include files in the include folder but in include/test folder. This way test headers can be included using a test/* path pattern as mbedtls and psa headers are included using an mbedtls/* and psa/* path pattern. This makes explicit the scope of the test headers. Move the existing includes for tests into include/test and update the code and build systems (make and cmake) accordingly. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-05-27 07:22:32 +00:00
#include "test/psa_crypto_helpers.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 09:26:37 +00: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 17:53:28 +00:00
#include "psa_crypto_storage.h"
typedef enum
{
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 13:06:43 +00:00
CLOSE_BY_CLOSE, /**< Close the handle(s). */
CLOSE_BY_DESTROY, /**< Destroy the handle(s). */
CLOSE_BY_SHUTDOWN, /**< Deinit and reinit without closing handles. */
CLOSE_BY_CLOSE_WITH_SHUTDOWN, /**< Close handle(s) then deinit/reinit. */
CLOSE_BY_DESTROY_WITH_SHUTDOWN, /**< Destroy handle(s) then deinit/reinit. */
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
} close_method_t;
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 09:44:48 +00:00
typedef enum
{
INVALID_HANDLE_0,
INVALID_HANDLE_UNOPENED,
INVALID_HANDLE_CLOSED,
INVALID_HANDLE_HUGE,
} invalid_handle_construction_t;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
/* All test functions that create persistent keys must call
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 16:39:37 +00:00
* `TEST_USES_KEY_ID( key_id )` before creating a persistent key with this
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
* identifier, and must call psa_purge_key_storage() in their cleanup
* code. */
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 17:19:39 +00:00
#if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
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 17:01:50 +00:00
static mbedtls_svc_key_id_t key_ids_used_in_test[9];
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 16:39:37 +00:00
static size_t num_key_ids_used;
/* Record a key id as potentially used in a test case. */
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 17:01:50 +00:00
static int test_uses_key_id( mbedtls_svc_key_id_t key_id )
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00: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 16:39:37 +00:00
size_t i;
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 15:13:42 +00:00
if( MBEDTLS_SVC_KEY_ID_GET_KEY_ID( key_id ) >
PSA_MAX_PERSISTENT_KEY_IDENTIFIER )
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 16:39:37 +00:00
{
/* Don't touch key id values that designate non-key files. */
return( 1 );
}
for( i = 0; i < num_key_ids_used ; i++ )
{
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 15:13:42 +00:00
if( mbedtls_svc_key_id_equal( key_id, key_ids_used_in_test[i] ) )
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 16:39:37 +00:00
return( 1 );
}
if( num_key_ids_used == ARRAY_LENGTH( key_ids_used_in_test ) )
return( 0 );
key_ids_used_in_test[num_key_ids_used] = key_id;
++num_key_ids_used;
return( 1 );
}
#define TEST_USES_KEY_ID( key_id ) \
TEST_ASSERT( test_uses_key_id( key_id ) )
/* Destroy all key ids that may have been created by the current test case. */
static void psa_purge_key_storage( void )
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00: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 16:39:37 +00:00
size_t i;
for( i = 0; i < num_key_ids_used; i++ )
psa_destroy_persistent_key( key_ids_used_in_test[i] );
num_key_ids_used = 0;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
}
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 17:19:39 +00:00
#else
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 16:39:37 +00:00
#define TEST_USES_KEY_ID( key_id ) ( (void) ( key_id ) )
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 17:19:39 +00:00
#endif /* MBEDTLS_PSA_CRYPTO_STORAGE_C */
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
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 13:06:43 +00:00
/** Apply \p close_method to invalidate the specified handles:
* close it, destroy it, or do nothing;
*/
static int invalidate_handle( close_method_t close_method,
psa_key_handle_t handle )
{
switch( close_method )
{
case CLOSE_BY_CLOSE:
case CLOSE_BY_CLOSE_WITH_SHUTDOWN:
PSA_ASSERT( psa_close_key( handle ) );
break;
case CLOSE_BY_DESTROY:
case CLOSE_BY_DESTROY_WITH_SHUTDOWN:
PSA_ASSERT( psa_destroy_key( handle ) );
break;
case CLOSE_BY_SHUTDOWN:
break;
}
return( 1 );
exit:
return( 0 );
}
/** Restart the PSA subsystem if \p close_method says so. */
static int invalidate_psa( close_method_t close_method )
{
switch( close_method )
{
case CLOSE_BY_CLOSE:
case CLOSE_BY_DESTROY:
return( 1 );
case CLOSE_BY_CLOSE_WITH_SHUTDOWN:
case CLOSE_BY_DESTROY_WITH_SHUTDOWN:
/* All keys must have been closed. */
PSA_DONE( );
break;
case CLOSE_BY_SHUTDOWN:
/* 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 17:53:28 +00:00
/* END_HEADER */
/* BEGIN_DEPENDENCIES
* depends_on:MBEDTLS_PSA_CRYPTO_C
* END_DEPENDENCIES
*/
/* BEGIN_CASE */
Align test functions to usage/alg parameter order Manually cherry-picked from ca5bed742fd1a886284baca48b2b7574d875630c by taking that patch, replacing KEYPAIR by KEY_PAIR throughout (renaming applied in this branch), and discarding parts about import_twice in test_suite_psa_crypto (this test function was removed from this branch).
2019-05-24 13:00:06 +00:00
void transient_slot_lifecycle( 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 11:20:52 +00:00
int type_arg, data_t *key_data,
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
int close_method_arg )
{
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 11:20:52 +00:00
psa_key_type_t type = type_arg;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
close_method_t close_method = close_method_arg;
Introduce PSA_KEY_HANDLE_INIT macro Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-30 15:48:03 +00: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 16:20:30 +00: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 17:53:28 +00: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 16:20:30 +00:00
/* Import a key. */
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 18:22:09 +00:00
PSA_ASSERT( psa_import_key( &attributes, key_data->x, key_data->len,
&handle ) );
Introduce psa_key_handle_is_null inline function Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-09-01 08:51:51 +00:00
TEST_ASSERT( ! psa_key_handle_is_null( handle ) );
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 16:20:30 +00:00
PSA_ASSERT( psa_get_key_attributes( handle, &attributes ) );
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 17:53:28 +00:00
/* Do something that invalidates the handle. */
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 13:06:43 +00:00
if( ! invalidate_handle( close_method, handle ) )
goto exit;
if( ! invalidate_psa( close_method ) )
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 16:20:30 +00:00
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
/* Test that the handle is now invalid. */
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 16:20:30 +00:00
TEST_EQUAL( psa_get_key_attributes( handle, &attributes ),
tests: Fix error codes when using "invalid" handles As handles are now key identifiers, a handle may be valid now even if it does not refer to any key known to the library. Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-09-17 12:12:30 +00:00
PSA_ERROR_DOES_NOT_EXIST );
TEST_EQUAL( psa_close_key( handle ), PSA_ERROR_DOES_NOT_EXIST );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00: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 13:10:21 +00:00
PSA_DONE( );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00: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 17:19:39 +00: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 13:06:14 +00: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 12:32:11 +00: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 11:20:52 +00:00
int type_arg, data_t *key_data,
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
int close_method_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 13:06:14 +00: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 17:53:28 +00:00
psa_algorithm_t alg = alg_arg;
Enrollment algorithm in policy: test persistent keys
2019-05-13 12:32:11 +00: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 17:53:28 +00: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 11:20:52 +00:00
psa_key_type_t type = type_arg;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
close_method_t close_method = close_method_arg;
Introduce PSA_KEY_HANDLE_INIT macro Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-30 15:48:03 +00: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 16:20:30 +00: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 12:24:15 +00: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 17:53:28 +00: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 13:24:05 +00: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 );
Introduce PSA_KEY_HANDLE_INIT macro Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-30 15:48:03 +00:00
psa_key_handle_t invalid_handle = PSA_KEY_HANDLE_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 13:24:05 +00: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 16:39:37 +00: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 17:53:28 +00:00
PSA_ASSERT( psa_crypto_init( ) );
/* Get a handle and import 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 14:12:22 +00: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 16:20:30 +00: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 12:32:11 +00:00
psa_set_key_enrollment_algorithm( &attributes, alg2 );
Split long lines after psa_import_key refactoring
2019-05-15 18:22:09 +00:00
PSA_ASSERT( psa_import_key( &attributes, key_data->x, key_data->len,
&handle ) );
Introduce psa_key_handle_is_null inline function Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-09-01 08:51:51 +00:00
TEST_ASSERT( ! psa_key_handle_is_null( handle ) );
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 13:24:05 +00:00
#if defined(MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER)
TEST_EQUAL( psa_open_key( wrong_owner_id, &invalid_handle ),
PSA_ERROR_DOES_NOT_EXIST );
#endif
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 12:24:15 +00: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 15:13:42 +00:00
TEST_ASSERT( mbedtls_svc_key_id_equal(
psa_get_key_id( &attributes ), id ) );
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 12:24:15 +00:00
TEST_EQUAL( psa_get_key_usage_flags( &attributes ), usage_flags );
TEST_EQUAL( psa_get_key_algorithm( &attributes ), alg );
Enrollment algorithm in policy: test persistent keys
2019-05-13 12:32:11 +00: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 12:24:15 +00: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 17:53:28 +00:00
/* Close the key and reopen it. */
PSA_ASSERT( psa_close_key( handle ) );
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 13:24:05 +00:00
#if defined(MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER)
TEST_EQUAL( psa_open_key( wrong_owner_id, &invalid_handle ),
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 16:44:55 +00:00
PSA_ASSERT( psa_open_key( id, &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 12:24:15 +00: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 15:13:42 +00:00
TEST_ASSERT( mbedtls_svc_key_id_equal(
psa_get_key_id( &attributes ), id ) );
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 12:24:15 +00:00
TEST_EQUAL( psa_get_key_usage_flags( &attributes ), usage_flags );
TEST_EQUAL( psa_get_key_algorithm( &attributes ), alg );
Enrollment algorithm in policy: test persistent keys
2019-05-13 12:32:11 +00: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 12:24:15 +00: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 17:53:28 +00:00
/* Do something that invalidates the handle. */
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 13:06:43 +00:00
if( ! invalidate_handle( close_method, handle ) )
goto exit;
if( ! invalidate_psa( close_method ) )
goto exit;
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
/* Try to reopen 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 12:24:15 +00:00
* exist. Otherwise check that it still exists and has the expected
* content. */
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
switch( close_method )
{
case CLOSE_BY_CLOSE:
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 13:06:43 +00:00
case CLOSE_BY_CLOSE_WITH_SHUTDOWN:
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
case CLOSE_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 16:44:55 +00:00
PSA_ASSERT( psa_open_key( id, &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 12:24:15 +00:00
PSA_ASSERT( psa_get_key_attributes( handle, &read_attributes ) );
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 15:13:42 +00:00
TEST_ASSERT( mbedtls_svc_key_id_equal(
psa_get_key_id( &attributes ),
psa_get_key_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 12:24:15 +00:00
TEST_EQUAL( psa_get_key_usage_flags( &attributes ), usage_flags );
TEST_EQUAL( psa_get_key_algorithm( &attributes ),
psa_get_key_algorithm( &read_attributes ) );
Enrollment algorithm in policy: test persistent keys
2019-05-13 12:32:11 +00: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 12:24:15 +00: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 ) );
if( usage_flags & PSA_KEY_USAGE_EXPORT )
{
ASSERT_ALLOC( reexported, key_data->len );
PSA_ASSERT( psa_export_key( handle,
reexported, key_data->len,
&reexported_length ) );
ASSERT_COMPARE( key_data->x, key_data->len,
reexported, reexported_length );
}
else
{
TEST_EQUAL( psa_export_key( handle,
Remove Dangerous Parameter Passing Another coverity bug - #350039 When this test discovers a key of the wrong type, it still throws it through the export function in order to check that it too will detect this as a not permitted action. For the buffer and buffer length arguments it passes in a local pointer (which will most likely be NULL), and the sizeof that pointer, as it knows that they will never be used. Coverity rightly (imho) flagged this as suspicious - if we are going to pass in incorrect parameters, at least make them obviously incorrect, and ones that will not potentially cause errors if the code later changes. There is, for example safety checks for zero length buffer, but less protection for an insufficiently sized one. Signed-off-by: Paul Elliott <paul.elliott@arm.com>
2020-06-15 15:21:33 +00:00
NULL, 0,
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 12:24:15 +00:00
&reexported_length ),
PSA_ERROR_NOT_PERMITTED );
}
Close or destroy keys explicitly in tests
2019-05-28 12:08:50 +00: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 17:53:28 +00: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 13:06:43 +00:00
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
case CLOSE_BY_DESTROY:
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 13:06:43 +00:00
case CLOSE_BY_DESTROY_WITH_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 16:44:55 +00:00
TEST_EQUAL( psa_open_key( id, &handle ),
Replace PSA error code definitions with the ones defined in PSA spec
2019-02-14 11:48:10 +00:00
PSA_ERROR_DOES_NOT_EXIST );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
break;
}
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 13:10:21 +00:00
PSA_DONE( );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
psa_purge_key_storage( );
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 12:24:15 +00:00
mbedtls_free( reexported );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00: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 17:19:39 +00: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 13:06:14 +00: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 17:53:28 +00: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 13:06:14 +00:00
mbedtls_svc_key_id_t id = mbedtls_svc_key_id_make( owner_id_arg, id_arg );
Introduce PSA_KEY_HANDLE_INIT macro Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-30 15:48:03 +00:00
psa_key_handle_t handle1 = PSA_KEY_HANDLE_INIT;
psa_key_handle_t handle2 = 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 16:20:30 +00: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 17:53:28 +00: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 16:20:30 +00: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 17:53:28 +00: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 16:39:37 +00: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 17:53:28 +00: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 14:12:22 +00: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 16:20:30 +00: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 18:22:09 +00:00
PSA_ASSERT( psa_import_key( &attributes, material1, sizeof( material1 ),
&handle1 ) );
Introduce psa_key_handle_is_null inline function Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-09-01 08:51:51 +00:00
TEST_ASSERT( ! psa_key_handle_is_null( handle1 ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
if( reopen_policy == CLOSE_BEFORE )
PSA_ASSERT( psa_close_key( handle1 ) );
/* Attempt to create a new key in the same slot. */
Split long lines after psa_import_key refactoring
2019-05-15 18:22:09 +00:00
TEST_EQUAL( psa_import_key( &attributes, material2, sizeof( material2 ),
&handle2 ),
Replace PSA error code definitions with the ones defined in PSA spec
2019-02-14 11:48:10 +00:00
PSA_ERROR_ALREADY_EXISTS );
Introduce psa_key_handle_is_null inline function Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-09-01 08:51:51 +00:00
TEST_ASSERT( psa_key_handle_is_null( handle2 ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
if( reopen_policy == CLOSE_AFTER )
PSA_ASSERT( psa_close_key( handle1 ) );
if( reopen_policy == CLOSE_BEFORE || reopen_policy == CLOSE_AFTER )
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 16:44:55 +00:00
PSA_ASSERT( psa_open_key( id, &handle1 ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00: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 16:20:30 +00:00
psa_reset_key_attributes( &attributes );
PSA_ASSERT( psa_get_key_attributes( handle1, &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 15:13:42 +00: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 16:20:30 +00: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 );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
PSA_ASSERT( psa_export_key( handle1,
reexported, sizeof( reexported ),
&reexported_length ) );
ASSERT_COMPARE( material1, sizeof( material1 ),
reexported, reexported_length );
Close or destroy keys explicitly in tests
2019-05-28 12:08:50 +00:00
PSA_ASSERT( psa_close_key( handle1 ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00: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 13:10:21 +00:00
PSA_DONE( );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
psa_purge_key_storage( );
}
/* 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 16:44:55 +00: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 17:53:28 +00: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 17:01:50 +00: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 17:53:28 +00: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 09:26:37 +00: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 17:53:28 +00: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 16:44:55 +00: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 08:51:51 +00: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 17:53:28 +00: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 13:10:21 +00:00
PSA_DONE( );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00: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 17:01:50 +00: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 16:20:30 +00: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 17:53:28 +00: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 09:26:37 +00:00
psa_key_handle_t handle = 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 16:20:30 +00: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 17:53:28 +00: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 16:39:37 +00: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 17:53:28 +00: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 14:12:22 +00: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 16:20:30 +00:00
psa_set_key_type( &attributes, PSA_KEY_TYPE_RAW_DATA );
Split long lines after psa_import_key refactoring
2019-05-15 18:22:09 +00:00
TEST_EQUAL( psa_import_key( &attributes, material, sizeof( material ),
&handle ),
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-17 23:33:25 +00:00
expected_status );
Introduce psa_key_handle_is_null inline function Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-09-01 08:51:51 +00: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 17:53:28 +00: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 13:10:21 +00:00
PSA_DONE( );
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 12:40:11 +00:00
#if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
psa_purge_key_storage( );
#endif
}
/* 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 13:06:14 +00: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 15:28:11 +00: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 12:40:11 +00: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 13:06:14 +00: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 15:28:11 +00: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 12:40:11 +00: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 17:01:50 +00: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 13:06:14 +00: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 12:40:11 +00:00
psa_key_usage_t source_usage = source_usage_arg;
psa_algorithm_t source_alg = source_alg_arg;
Introduce PSA_KEY_HANDLE_INIT macro Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-30 15:48:03 +00:00
psa_key_handle_t source_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 16:20:30 +00: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 12:40:11 +00:00
psa_key_type_t source_type = type_arg;
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 17:01:50 +00: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 13:06:14 +00: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 12:40:11 +00:00
psa_key_usage_t target_usage = target_usage_arg;
psa_algorithm_t target_alg = target_alg_arg;
Introduce PSA_KEY_HANDLE_INIT macro Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-30 15:48:03 +00:00
psa_key_handle_t target_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 16:20:30 +00:00
psa_key_attributes_t target_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 12:40:11 +00: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 15:28:11 +00: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 12:40:11 +00: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 16:39:37 +00: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 12:40:11 +00: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 15:13:42 +00: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 16:20:30 +00: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 15:28:11 +00:00
psa_set_key_enrollment_algorithm( &source_attributes, source_alg2_arg );
Split long lines after psa_import_key refactoring
2019-05-15 18:22:09 +00:00
PSA_ASSERT( psa_import_key( &source_attributes,
material->x, material->len,
&source_handle ) );
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 16:20:30 +00:00
/* Update the attributes with the bit size. */
PSA_ASSERT( psa_get_key_attributes( source_handle, &source_attributes ) );
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 12:40:11 +00: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 15:13:42 +00: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 16:20:30 +00: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 15:28:11 +00: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 12:40:11 +00:00
/* Copy the key. */
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 16:20:30 +00:00
PSA_ASSERT( psa_copy_key( source_handle,
&target_attributes, &target_handle ) );
New function psa_copy_key Copy a key from one slot to another. Implemented and smoke-tested.
2019-01-19 12:40:11 +00:00
/* Destroy the source to ensure that this doesn't affect the target. */
PSA_ASSERT( psa_destroy_key( source_handle ) );
/* If the target key is persistent, restart the system to make
* sure that the material is still alive. */
if( target_lifetime != PSA_KEY_LIFETIME_VOLATILE )
{
Close or destroy keys explicitly in tests
2019-05-28 12:08:50 +00: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 12:40:11 +00: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 16:44:55 +00: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 12:40:11 +00: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 16:20:30 +00:00
psa_reset_key_attributes( &target_attributes );
PSA_ASSERT( psa_get_key_attributes( target_handle, &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 15:13:42 +00:00
if( target_lifetime != PSA_KEY_LIFETIME_VOLATILE )
{
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: 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 13:06:14 +00:00
TEST_EQUAL( MBEDTLS_SVC_KEY_ID_GET_OWNER_ID( target_id ),
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 15:13:42 +00:00
#endif
TEST_EQUAL( MBEDTLS_SVC_KEY_ID_GET_KEY_ID( target_id ), 0 );
}
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 16:20:30 +00: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 15:28:11 +00: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 12:40:11 +00:00
if( expected_usage & PSA_KEY_USAGE_EXPORT )
{
size_t length;
ASSERT_ALLOC( export_buffer, material->len );
PSA_ASSERT( psa_export_key( target_handle, export_buffer,
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 12:03:09 +00: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 16:20:30 +00:00
{
size_t length;
/* Check that the key is actually non-exportable. */
TEST_EQUAL( psa_export_key( target_handle, export_buffer,
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 12:03:09 +00:00
Close or destroy keys explicitly in tests
2019-05-28 12:08:50 +00:00
PSA_ASSERT( psa_destroy_key( target_handle ) );
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 12:03:09 +00: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 13:10:21 +00: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 16:20:30 +00: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 12:03:09 +00:00
#if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
psa_purge_key_storage( );
#endif
}
/* 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 17:01:50 +00: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 12:03:09 +00:00
psa_key_usage_t source_usage = source_usage_arg;
psa_algorithm_t source_alg = source_alg_arg;
Introduce PSA_KEY_HANDLE_INIT macro Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-30 15:48:03 +00:00
psa_key_handle_t source_handle = PSA_KEY_HANDLE_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 12:03:09 +00:00
psa_key_type_t source_type = source_type_arg;
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 17:01:50 +00: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 12:03:09 +00:00
psa_key_usage_t target_usage = target_usage_arg;
psa_algorithm_t target_alg = target_alg_arg;
Introduce PSA_KEY_HANDLE_INIT macro Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-30 15:48:03 +00:00
psa_key_handle_t target_handle = PSA_KEY_HANDLE_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 12:03:09 +00:00
psa_key_type_t target_type = target_type_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 09:26:37 +00:00
psa_key_handle_t new_handle = mbedtls_svc_key_id_make( 0xdead, 0xdead );
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 12:03:09 +00: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 16:20:30 +00: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 12:03:09 +00: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 16:39:37 +00: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 12:03:09 +00:00
PSA_ASSERT( psa_crypto_init( ) );
/* Populate the source slot. */
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 16:20:30 +00:00
if( source_lifetime != PSA_KEY_LIFETIME_VOLATILE )
Replace psa_make_key_persistent by id/lifetime setters in tests Remove all internal uses of psa_make_key_persistent.
2019-05-15 14:12:22 +00: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 16:20:30 +00: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 18:22:09 +00:00
PSA_ASSERT( psa_import_key( &attributes,
source_material->x, source_material->len,
&source_handle ) );
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 12:03:09 +00: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 15:13:42 +00: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 16:20:30 +00:00
{
target_handle = source_handle;
}
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 12:03:09 +00: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 16:20:30 +00:00
{
Replace psa_make_key_persistent by id/lifetime setters in tests Remove all internal uses of psa_make_key_persistent.
2019-05-15 14:12:22 +00: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 16:20:30 +00: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 18:22:09 +00:00
PSA_ASSERT( psa_import_key( &attributes1,
target_material->x, target_material->len,
&target_handle ) );
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 16:20:30 +00:00
}
PSA_ASSERT( psa_get_key_attributes( target_handle, &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 12:03:09 +00: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 16:20:30 +00: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 14:12:22 +00:00
psa_set_key_id( &attributes, target_id );
psa_set_key_lifetime( &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 16:20:30 +00:00
TEST_EQUAL( psa_copy_key( source_handle,
&attributes, &new_handle ),
Replace PSA error code definitions with the ones defined in PSA spec
2019-02-14 11:48:10 +00:00
PSA_ERROR_ALREADY_EXISTS );
Introduce psa_key_handle_is_null inline function Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-09-01 08:51:51 +00:00
TEST_ASSERT( psa_key_handle_is_null( new_handle ) );
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 12:03:09 +00:00
/* Test that the target slot is unaffected. */
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 16:20:30 +00:00
PSA_ASSERT( psa_get_key_attributes( target_handle, &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 15:13:42 +00: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 16:20:30 +00: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 12:03:09 +00:00
if( target_usage & PSA_KEY_USAGE_EXPORT )
{
size_t length;
ASSERT_ALLOC( export_buffer, target_material->len );
PSA_ASSERT( psa_export_key( target_handle, export_buffer,
target_material->len, &length ) );
ASSERT_COMPARE( target_material->x, target_material->len,
export_buffer, length );
}
Close or destroy keys explicitly in tests
2019-05-28 12:08:50 +00:00
PSA_ASSERT( psa_destroy_key( source_handle ) );
Introduce psa_key_handle_equal inline function Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-09-01 07:02:08 +00:00
if( ! psa_key_handle_equal( target_handle, source_handle ) )
Close or destroy keys explicitly in tests
2019-05-28 12:08:50 +00:00
PSA_ASSERT( psa_destroy_key( target_handle ) );
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 12:03:09 +00: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 13:10:21 +00: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 12:03:09 +00:00
mbedtls_free( export_buffer );
#if defined(MBEDTLS_PSA_CRYPTO_STORAGE_C)
psa_purge_key_storage( );
#endif
}
/* END_CASE */
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00: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 09:44:48 +00:00
void invalid_handle( int handle_construction,
int close_status_arg, int usage_status_arg )
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
{
Introduce PSA_KEY_HANDLE_INIT macro Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-30 15:48:03 +00: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 09:26:37 +00: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 09:44:48 +00:00
psa_status_t close_status = close_status_arg;
psa_status_t usage_status = usage_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 16:20:30 +00: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 17:53:28 +00: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 16:20:30 +00: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 18:22:09 +00: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 09:44:48 +00:00
&valid_handle ) );
Introduce psa_key_handle_is_null inline function Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-09-01 08:51:51 +00: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 17:53:28 +00: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 09:44:48 +00: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 14:23:49 +00: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 09:44:48 +00:00
case INVALID_HANDLE_0:
Introduce PSA_KEY_HANDLE_INIT macro Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-07-30 15:48:03 +00: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 09:44:48 +00: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 09:26:37 +00: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 09:44:48 +00: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 09:26:37 +00: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 09:44:48 +00: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 09:26:37 +00: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 09:44:48 +00:00
break;
default:
TEST_ASSERT( ! "unknown handle construction" );
Update slot management tests now that {close,destroy}_key(0) succeed
2019-10-09 14:23:49 +00: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 09:44:48 +00:00
/* Attempt to use the invalid handle. */
TEST_EQUAL( psa_get_key_attributes( invalid_handle, &attributes ),
usage_status );
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 17:53:28 +00: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 09:44:48 +00:00
PSA_ASSERT( psa_get_key_attributes( valid_handle, &attributes ) );
Convert remaining obsolete function call
2019-05-27 12:53:07 +00: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 09:44:48 +00: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 17:53:28 +00: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 13:10:21 +00:00
PSA_DONE( );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
}
/* END_CASE */
/* BEGIN_CASE */
void many_transient_handles( int max_handles_arg )
{
psa_key_handle_t *handles = NULL;
size_t max_handles = max_handles_arg;
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 16:20:30 +00: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 17:53:28 +00:00
uint8_t exported[sizeof( size_t )];
size_t exported_length;
ASSERT_ALLOC( handles, max_handles );
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 16:20:30 +00: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 17:53:28 +00:00
for( i = 0; i < max_handles; i++ )
{
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 18:15:10 +00:00
status = psa_import_key( &attributes,
(uint8_t *) &i, sizeof( i ),
&handles[i] );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00: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-17 23:18:46 +00:00
PSA_ASSERT( status );
Introduce psa_key_handle_is_null inline function Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-09-01 08:51:51 +00:00
TEST_ASSERT( ! psa_key_handle_is_null( handles[i] ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
for( j = 0; j < i; j++ )
Introduce psa_key_handle_equal inline function Signed-off-by: Ronald Cron <ronald.cron@arm.com>
2020-09-01 07:02:08 +00:00
TEST_ASSERT( ! psa_key_handle_equal( handles[i], handles[j] ) );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
}
max_handles = i;
for( i = 1; i < max_handles; i++ )
{
PSA_ASSERT( psa_close_key( handles[i - 1] ) );
PSA_ASSERT( psa_export_key( handles[i],
exported, sizeof( exported ),
&exported_length ) );
ASSERT_COMPARE( exported, exported_length,
(uint8_t *) &i, sizeof( i ) );
}
PSA_ASSERT( psa_close_key( handles[i - 1] ) );
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 13:10:21 +00:00
PSA_DONE( );
Add tests for the new slot management mechanism Add unit tests for handle allocation and release.
2018-11-30 17:53:28 +00:00
mbedtls_free( handles );
}
/* END_CASE */
Reference in a new issue Copy permalink