From 3b97011e39cd9ca844364e71cea06821d1124b66 Mon Sep 17 00:00:00 2001 From: "harshal.patil" Date: Fri, 23 Aug 2024 17:51:03 +0530 Subject: [PATCH] fix(esp_security/ds): Clean up DS trying to re-acquire MPI lock post common crypto lock layer --- components/esp_security/src/esp_ds.c | 7 +------ .../test_apps/crypto_drivers/main/test_app_main.c | 4 ++-- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/components/esp_security/src/esp_ds.c b/components/esp_security/src/esp_ds.c index 155d6f5d96..8211b86508 100644 --- a/components/esp_security/src/esp_ds.c +++ b/components/esp_security/src/esp_ds.c @@ -262,9 +262,7 @@ esp_err_t esp_ds_encrypt_params(esp_ds_data_t *data, static void ds_acquire_enable(void) { esp_crypto_ds_lock_acquire(); -#if CONFIG_IDF_TARGET_ESP32S3 - esp_crypto_mpi_lock_acquire(); -#endif + // We also enable SHA and HMAC here. SHA is used by HMAC, HMAC is used by DS. HMAC_RCC_ATOMIC() { hmac_ll_enable_bus_clock(true); @@ -300,9 +298,6 @@ static void ds_disable_release(void) hmac_ll_enable_bus_clock(false); } -#if CONFIG_IDF_TARGET_ESP32S3 - esp_crypto_mpi_lock_release(); -#endif esp_crypto_ds_lock_release(); } diff --git a/components/esp_security/test_apps/crypto_drivers/main/test_app_main.c b/components/esp_security/test_apps/crypto_drivers/main/test_app_main.c index 4e376db7e2..63429b2643 100644 --- a/components/esp_security/test_apps/crypto_drivers/main/test_app_main.c +++ b/components/esp_security/test_apps/crypto_drivers/main/test_app_main.c @@ -29,7 +29,7 @@ void set_leak_threshold(int threshold) static size_t before_free_8bit; static size_t before_free_32bit; -static const char* TAG = "esp_hw_support_test_app"; +static const char* TAG = "crypto_drivers_test_app"; static void check_leak(size_t before_free, size_t after_free, const char *type) { @@ -81,6 +81,6 @@ void tearDown(void) void app_main(void) { vTaskPrioritySet(NULL, TEST_TASK_PRIORITY); - ESP_LOGI(TAG, "Running esp-hw-support test app"); + ESP_LOGI(TAG, "Running crypto drivers test app"); unity_run_menu(); }