Add new psa_key_agreement() to key exercises
Signed-off-by: Paul Elliott <paul.elliott@arm.com>
diff --git a/tests/include/test/psa_exercise_key.h b/tests/include/test/psa_exercise_key.h
index f6be307..f44608b 100644
--- a/tests/include/test/psa_exercise_key.h
+++ b/tests/include/test/psa_exercise_key.h
@@ -138,7 +138,7 @@
size_t capacity, int key_destroyable);
/** Perform a key agreement using the given key pair against its public key
- * using psa_raw_key_agreement().
+ * using psa_raw_key_agreement() and psa_key_agreement().
*
* The result is discarded. The purpose of this function is to smoke-test a key.
*
diff --git a/tests/src/psa_exercise_key.c b/tests/src/psa_exercise_key.c
index 032c489..62fa455 100644
--- a/tests/src/psa_exercise_key.c
+++ b/tests/src/psa_exercise_key.c
@@ -695,6 +695,9 @@
size_t output_length;
psa_key_attributes_t attributes = PSA_KEY_ATTRIBUTES_INIT;
+ mbedtls_svc_key_id_t shared_secret_id = MBEDTLS_SVC_KEY_ID_INIT;
+ psa_key_attributes_t shared_secret_attributes = PSA_KEY_ATTRIBUTES_INIT;
+
psa_status_t status = psa_get_key_attributes(key, &attributes);
if (key_destroyable && status == PSA_ERROR_INVALID_HANDLE) {
/* The key has been destroyed. */
@@ -734,6 +737,17 @@
PSA_RAW_KEY_AGREEMENT_OUTPUT_MAX_SIZE);
}
+ psa_set_key_type(&shared_secret_attributes, PSA_KEY_TYPE_DERIVE);
+ psa_set_key_usage_flags(&shared_secret_attributes, PSA_KEY_USAGE_DERIVE | PSA_KEY_USAGE_EXPORT);
+
+ status = psa_key_agreement(key, public_key, public_key_length, alg,
+ &shared_secret_attributes, &shared_secret_id);
+
+ if (key_destroyable && status == PSA_ERROR_INVALID_HANDLE) {
+ /* The key has been destroyed. */
+ status = PSA_SUCCESS;
+ }
+
exit:
/*
* Key attributes may have been returned by psa_get_key_attributes()
@@ -741,6 +755,10 @@
*/
psa_reset_key_attributes(&attributes);
+ /* Make sure to reset and free derived key attributes and slot. */
+ psa_reset_key_attributes(&shared_secret_attributes);
+ psa_destroy_key(shared_secret_id);
+
mbedtls_free(public_key);
return status;
}