From 70d8fea2dc77884ca8928f6e1f11deeebaf335cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Wed, 3 Apr 2024 09:54:49 +0200 Subject: [PATCH] Finish backporting hits_export_public_key; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A previous commit backported the declaration of this field as part of conflict resolution in the hope of preventing further conflicts in the future. But if we backport it we should do it properly. This commit finishes the job. Signed-off-by: Manuel Pégourié-Gonnard --- tests/src/drivers/test_driver_key_management.c | 1 + tests/suites/test_suite_psa_crypto_driver_wrappers.function | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/src/drivers/test_driver_key_management.c b/tests/src/drivers/test_driver_key_management.c index e6d7a01074..54a3f5b726 100644 --- a/tests/src/drivers/test_driver_key_management.c +++ b/tests/src/drivers/test_driver_key_management.c @@ -292,6 +292,7 @@ psa_status_t mbedtls_test_transparent_export_public_key( uint8_t *data, size_t data_size, size_t *data_length) { ++mbedtls_test_driver_key_management_hooks.hits; + ++mbedtls_test_driver_key_management_hooks.hits_export_public_key; if (mbedtls_test_driver_key_management_hooks.forced_status != PSA_SUCCESS) { return mbedtls_test_driver_key_management_hooks.forced_status; diff --git a/tests/suites/test_suite_psa_crypto_driver_wrappers.function b/tests/suites/test_suite_psa_crypto_driver_wrappers.function index 64b3d1b67d..eba637f223 100644 --- a/tests/suites/test_suite_psa_crypto_driver_wrappers.function +++ b/tests/suites/test_suite_psa_crypto_driver_wrappers.function @@ -426,6 +426,7 @@ void export_key(int force_status_arg, mbedtls_test_driver_key_management_hooks.hits = 0; mbedtls_test_driver_key_management_hooks.forced_status = force_status; + mbedtls_test_driver_key_management_hooks.hits_export_public_key = 0; if (PSA_KEY_TYPE_IS_ECC_PUBLIC_KEY(output_key_type)) { actual_status = psa_export_public_key(handle, @@ -442,7 +443,7 @@ void export_key(int force_status_arg, if (PSA_KEY_TYPE_IS_ECC_PUBLIC_KEY(output_key_type) && !PSA_KEY_TYPE_IS_ECC_PUBLIC_KEY(input_key_type)) { - TEST_EQUAL(mbedtls_test_driver_key_management_hooks.hits, 1); + TEST_EQUAL(mbedtls_test_driver_key_management_hooks.hits_export_public_key, 1); } if (actual_status == PSA_SUCCESS) {