From 34e24e1ed32751df44bd6289357dbf2636a333e8 Mon Sep 17 00:00:00 2001 From: "nilesh.kale" Date: Tue, 19 May 2026 15:05:19 +0530 Subject: [PATCH] fix: disable Key Manager and ECDSA TRNG tests for S31 temporarily --- .../esp_hal_security/test_apps/crypto/main/app_main.c | 3 ++- .../test_apps/crypto/main/ecdsa/test_ecdsa.c | 9 +++++++++ .../test_apps/crypto_drivers/main/test_key_mgr.c | 5 +++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/components/esp_hal_security/test_apps/crypto/main/app_main.c b/components/esp_hal_security/test_apps/crypto/main/app_main.c index b7e8e6119ee..c7c923e20cf 100644 --- a/components/esp_hal_security/test_apps/crypto/main/app_main.c +++ b/components/esp_hal_security/test_apps/crypto/main/app_main.c @@ -31,7 +31,8 @@ static void run_all_tests(void) #endif /* !CONFIG_SOC_SHA_SUPPORT_PARALLEL_ENG*/ #endif -#if CONFIG_CRYPTO_IS_KEY_MANAGER_SUPPORTED +#if CONFIG_CRYPTO_IS_KEY_MANAGER_SUPPORTED && !CONFIG_IDF_TARGET_ESP32S31 + // TODO: IDF-15703 re-enable Key Manager tests on esp32s31 once the TRNG support update lands RUN_TEST_GROUP(key_manager); #endif diff --git a/components/esp_hal_security/test_apps/crypto/main/ecdsa/test_ecdsa.c b/components/esp_hal_security/test_apps/crypto/main/ecdsa/test_ecdsa.c index 62aa5c73967..b419059b9ee 100644 --- a/components/esp_hal_security/test_apps/crypto/main/ecdsa/test_ecdsa.c +++ b/components/esp_hal_security/test_apps/crypto/main/ecdsa/test_ecdsa.c @@ -464,7 +464,10 @@ TEST_GROUP_RUNNER(ecdsa) { /* SECP192R1 test cases */ RUN_TEST_CASE(ecdsa, ecdsa_SECP192R1_signature_verification) +#if !CONFIG_IDF_TARGET_ESP32S31 + // TODO: IDF-15703 re-enable TRNG-backed sign_and_verify on esp32s31 once the TRNG support update lands RUN_TEST_CASE(ecdsa, ecdsa_SECP192R1_sign_and_verify) +#endif RUN_TEST_CASE(ecdsa, ecdsa_SECP192R1_corrupt_signature) #ifdef SOC_ECDSA_SUPPORT_DETERMINISTIC_MODE RUN_TEST_CASE(ecdsa, ecdsa_SECP192R1_det_sign_and_verify) @@ -475,7 +478,10 @@ TEST_GROUP_RUNNER(ecdsa) /* SECP256R1 test cases */ RUN_TEST_CASE(ecdsa, ecdsa_SECP256R1_signature_verification) +#if !CONFIG_IDF_TARGET_ESP32S31 + // TODO: IDF-15703 re-enable TRNG-backed sign_and_verify on esp32s31 once the TRNG support update lands RUN_TEST_CASE(ecdsa, ecdsa_SECP256R1_sign_and_verify) +#endif RUN_TEST_CASE(ecdsa, ecdsa_SECP256R1_corrupt_signature) #ifdef SOC_ECDSA_SUPPORT_DETERMINISTIC_MODE RUN_TEST_CASE(ecdsa, ecdsa_SECP256R1_det_sign_and_verify) @@ -487,7 +493,10 @@ TEST_GROUP_RUNNER(ecdsa) /* SECP384R1 test cases */ #ifdef SOC_ECDSA_SUPPORT_CURVE_P384 RUN_TEST_CASE(ecdsa, ecdsa_SECP384R1_signature_verification) +#if !CONFIG_IDF_TARGET_ESP32S31 + // TODO: IDF-15703 re-enable TRNG-backed sign_and_verify on esp32s31 once the TRNG support update lands RUN_TEST_CASE(ecdsa, ecdsa_SECP384R1_sign_and_verify) +#endif RUN_TEST_CASE(ecdsa, ecdsa_SECP384R1_corrupt_signature) #ifdef SOC_ECDSA_SUPPORT_DETERMINISTIC_MODE RUN_TEST_CASE(ecdsa, ecdsa_SECP384R1_det_sign_and_verify) diff --git a/components/esp_security/test_apps/crypto_drivers/main/test_key_mgr.c b/components/esp_security/test_apps/crypto_drivers/main/test_key_mgr.c index 07475f4da6d..31d480d700d 100644 --- a/components/esp_security/test_apps/crypto_drivers/main/test_key_mgr.c +++ b/components/esp_security/test_apps/crypto_drivers/main/test_key_mgr.c @@ -19,7 +19,8 @@ #include "esp_system.h" #include "unity_test_utils_memory.h" -#if SOC_KEY_MANAGER_SUPPORTED +// TODO: IDF-15703 re-enable Key Manager driver tests on esp32s31 once the TRNG support update lands +#if SOC_KEY_MANAGER_SUPPORTED && !CONFIG_IDF_TARGET_ESP32S31 #include "hal/key_mgr_ll.h" #if SOC_KEY_MANAGER_HMAC_KEY_DEPLOY @@ -522,4 +523,4 @@ TEST_CASE("Key Manager ECDH1 mode: DS key deployment", "[hw_crypto] [key_mgr]") free(key_recovery_info); } #endif /* SOC_KEY_MANAGER_DS_KEY_DEPLOY */ -#endif /* SOC_KEY_MANAGER_SUPPORTED */ +#endif /* SOC_KEY_MANAGER_SUPPORTED && !CONFIG_IDF_TARGET_ESP32S31 */