From 03efa0b8d32de4650043b0f5979c36792720aea0 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Tue, 12 Apr 2022 17:08:34 +0200 Subject: [PATCH] Fix ARIA support in test driver configuration Deduce MBEDTLS_PSA_ACCEL_KEY_TYPE_ARIA for the driver build from its value from the core build, as is done for other key types. This had not been done correctly when adding ARIA support to the PSA subsystem. Signed-off-by: Gilles Peskine --- library/psa_crypto_driver_wrappers.c | 2 ++ .../test/drivers/crypto_config_test_driver_extension.h | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/library/psa_crypto_driver_wrappers.c b/library/psa_crypto_driver_wrappers.c index 16166fc5a..c455ecb93 100644 --- a/library/psa_crypto_driver_wrappers.c +++ b/library/psa_crypto_driver_wrappers.c @@ -854,6 +854,8 @@ psa_status_t psa_driver_wrapper_cipher_encrypt( (void)key_buffer; (void)key_buffer_size; (void)alg; + (void)iv; + (void)iv_length; (void)input; (void)input_length; (void)output; diff --git a/tests/include/test/drivers/crypto_config_test_driver_extension.h b/tests/include/test/drivers/crypto_config_test_driver_extension.h index f5be7b385..af4686b97 100644 --- a/tests/include/test/drivers/crypto_config_test_driver_extension.h +++ b/tests/include/test/drivers/crypto_config_test_driver_extension.h @@ -166,6 +166,14 @@ #endif #endif +#if defined(PSA_WANT_KEY_TYPE_ARIA) +#if defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_ARIA) +#undef MBEDTLS_PSA_ACCEL_KEY_TYPE_ARIA +#else +#define MBEDTLS_PSA_ACCEL_KEY_TYPE_ARIA 1 +#endif +#endif + #if defined(PSA_WANT_KEY_TYPE_CAMELLIA) #if defined(MBEDTLS_PSA_ACCEL_KEY_TYPE_CAMELLIA) #undef MBEDTLS_PSA_ACCEL_KEY_TYPE_CAMELLIA