Add key_destroyable parameter to exercise_aead_key

Signed-off-by: Ryan Everett <ryan.everett@arm.com>
This commit is contained in:
Ryan Everett 2024-03-12 16:09:25 +00:00
parent 70691f3082
commit fbe703de2a

View File

@ -262,7 +262,8 @@ exit:
static int exercise_aead_key(mbedtls_svc_key_id_t key, static int exercise_aead_key(mbedtls_svc_key_id_t key,
psa_key_usage_t usage, psa_key_usage_t usage,
psa_algorithm_t alg) psa_algorithm_t alg,
int key_destroyable)
{ {
unsigned char nonce[PSA_AEAD_NONCE_MAX_SIZE] = { 0 }; unsigned char nonce[PSA_AEAD_NONCE_MAX_SIZE] = { 0 };
size_t nonce_length; size_t nonce_length;
@ -272,6 +273,7 @@ static int exercise_aead_key(mbedtls_svc_key_id_t key,
unsigned char ciphertext[48] = "(wabblewebblewibblewobblewubble)"; unsigned char ciphertext[48] = "(wabblewebblewibblewobblewubble)";
size_t ciphertext_length = sizeof(ciphertext); size_t ciphertext_length = sizeof(ciphertext);
size_t plaintext_length = sizeof(ciphertext); size_t plaintext_length = sizeof(ciphertext);
psa_status_t status = PSA_SUCCESS;
/* Convert wildcard algorithm to exercisable algorithm */ /* Convert wildcard algorithm to exercisable algorithm */
if (alg & PSA_ALG_AEAD_AT_LEAST_THIS_LENGTH_FLAG) { if (alg & PSA_ALG_AEAD_AT_LEAST_THIS_LENGTH_FLAG) {
@ -283,12 +285,17 @@ static int exercise_aead_key(mbedtls_svc_key_id_t key,
nonce_length = PSA_AEAD_NONCE_LENGTH(key_type, alg); nonce_length = PSA_AEAD_NONCE_LENGTH(key_type, alg);
if (usage & PSA_KEY_USAGE_ENCRYPT) { if (usage & PSA_KEY_USAGE_ENCRYPT) {
PSA_ASSERT(psa_aead_encrypt(key, alg, status = psa_aead_encrypt(key, alg,
nonce, nonce_length, nonce, nonce_length,
NULL, 0, NULL, 0,
plaintext, sizeof(plaintext), plaintext, sizeof(plaintext),
ciphertext, sizeof(ciphertext), ciphertext, sizeof(ciphertext),
&ciphertext_length)); &ciphertext_length);
if (key_destroyable && status == PSA_ERROR_INVALID_HANDLE) {
/* The key has been destroyed. */
return 1;
}
PSA_ASSERT(status);
} }
if (usage & PSA_KEY_USAGE_DECRYPT) { if (usage & PSA_KEY_USAGE_DECRYPT) {
@ -296,13 +303,17 @@ static int exercise_aead_key(mbedtls_svc_key_id_t key,
(usage & PSA_KEY_USAGE_ENCRYPT ? (usage & PSA_KEY_USAGE_ENCRYPT ?
PSA_SUCCESS : PSA_SUCCESS :
PSA_ERROR_INVALID_SIGNATURE); PSA_ERROR_INVALID_SIGNATURE);
TEST_EQUAL(psa_aead_decrypt(key, alg, status = psa_aead_decrypt(key, alg,
nonce, nonce_length, nonce, nonce_length,
NULL, 0, NULL, 0,
ciphertext, ciphertext_length, ciphertext, ciphertext_length,
plaintext, sizeof(plaintext), plaintext, sizeof(plaintext),
&plaintext_length), &plaintext_length);
verify_status); if (key_destroyable && status == PSA_ERROR_INVALID_HANDLE) {
/* The key has been destroyed. */
return 1;
}
TEST_ASSERT(status == verify_status);
} }
return 1; return 1;