mirror of
https://github.com/Mbed-TLS/mbedtls.git
synced 2025-04-17 02:43:26 +00:00
Add key_destroyable parameter to check_key_attributes_sanity
This function is currently only used in the exercise_key smoke test. Signed-off-by: Ryan Everett <ryan.everett@arm.com>
This commit is contained in:
parent
0a271fde76
commit
f08a93fbe5
@ -38,7 +38,8 @@ static int lifetime_is_dynamic_secure_element(psa_key_lifetime_t lifetime)
|
||||
}
|
||||
#endif
|
||||
|
||||
static int check_key_attributes_sanity(mbedtls_svc_key_id_t key)
|
||||
static int check_key_attributes_sanity(mbedtls_svc_key_id_t key,
|
||||
int key_destroyable)
|
||||
{
|
||||
int ok = 0;
|
||||
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
|
||||
@ -46,8 +47,13 @@ static int check_key_attributes_sanity(mbedtls_svc_key_id_t key)
|
||||
mbedtls_svc_key_id_t id;
|
||||
psa_key_type_t type;
|
||||
size_t bits;
|
||||
|
||||
PSA_ASSERT(psa_get_key_attributes(key, &attributes));
|
||||
psa_status_t status = psa_get_key_attributes(key, &attributes);
|
||||
if (key_destroyable && status == PSA_ERROR_INVALID_HANDLE) {
|
||||
/* The key has been destroyed. */
|
||||
psa_reset_key_attributes(&attributes);
|
||||
return 1;
|
||||
}
|
||||
PSA_ASSERT(status);
|
||||
lifetime = psa_get_key_lifetime(&attributes);
|
||||
id = psa_get_key_id(&attributes);
|
||||
type = psa_get_key_type(&attributes);
|
||||
@ -66,17 +72,20 @@ static int check_key_attributes_sanity(mbedtls_svc_key_id_t key)
|
||||
(MBEDTLS_SVC_KEY_ID_GET_KEY_ID(id) <= PSA_KEY_ID_USER_MAX));
|
||||
}
|
||||
#if defined(MBEDTLS_PSA_CRYPTO_SE_C)
|
||||
/* randomly-generated 64-bit constant, should never appear in test data */
|
||||
psa_key_slot_number_t slot_number = 0xec94d4a5058a1a21;
|
||||
psa_status_t status = psa_get_key_slot_number(&attributes, &slot_number);
|
||||
if (lifetime_is_dynamic_secure_element(lifetime)) {
|
||||
/* Mbed TLS currently always exposes the slot number to
|
||||
* applications. This is not mandated by the PSA specification
|
||||
* and may change in future versions. */
|
||||
TEST_EQUAL(status, 0);
|
||||
TEST_ASSERT(slot_number != 0xec94d4a5058a1a21);
|
||||
} else {
|
||||
TEST_EQUAL(status, PSA_ERROR_INVALID_ARGUMENT);
|
||||
/* MBEDTLS_PSA_CRYPTO_SE_C does not support thread safety. */
|
||||
if (key_destroyable == 0) {
|
||||
/* randomly-generated 64-bit constant, should never appear in test data */
|
||||
psa_key_slot_number_t slot_number = 0xec94d4a5058a1a21;
|
||||
status = psa_get_key_slot_number(&attributes, &slot_number);
|
||||
if (lifetime_is_dynamic_secure_element(lifetime)) {
|
||||
/* Mbed TLS currently always exposes the slot number to
|
||||
* applications. This is not mandated by the PSA specification
|
||||
* and may change in future versions. */
|
||||
TEST_EQUAL(status, 0);
|
||||
TEST_ASSERT(slot_number != 0xec94d4a5058a1a21);
|
||||
} else {
|
||||
TEST_EQUAL(status, PSA_ERROR_INVALID_ARGUMENT);
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user