From 4821f331fed82a788b7260246bfa5767fb779a5f Mon Sep 17 00:00:00 2001 From: "harshal.patil" Date: Fri, 8 May 2026 08:22:10 +0530 Subject: [PATCH] refactor(mbedtls/test): Move the mbedtls test app to support multiple test apps --- .../test_apps/tee_test_fw/main/CMakeLists.txt | 4 ++-- components/mbedtls/test_apps/.build-test-rules.yml | 2 +- .../test_apps/{ => mbedtls_ut}/CMakeLists.txt | 0 .../mbedtls/test_apps/{ => mbedtls_ut}/README.md | 0 .../test_apps/{ => mbedtls_ut}/ecdsa_key_p192.pem | 0 .../test_apps/{ => mbedtls_ut}/ecdsa_key_p256.pem | 0 .../test_apps/{ => mbedtls_ut}/ecdsa_key_p384.pem | 0 .../{ => mbedtls_ut}/include/crypto_performance.h | 0 .../test_apps/{ => mbedtls_ut}/main/CMakeLists.txt | 0 .../{ => mbedtls_ut}/main/Kconfig.projbuild | 0 .../test_apps/{ => mbedtls_ut}/main/app_main.c | 0 .../{ => mbedtls_ut}/main/crts/bad_md_crt.pem | 0 .../main/crts/correct_sig_crt_esp32_com.pem | 0 .../{ => mbedtls_ut}/main/crts/ecdsa_cert_bundle | Bin .../main/crts/ecdsa_correct_sig_crt.pem | 0 .../main/crts/ecdsa_wrong_sig_crt.pem | 0 .../{ => mbedtls_ut}/main/crts/prvtkey.pem | 0 .../{ => mbedtls_ut}/main/crts/server_cert_bundle | Bin .../main/crts/server_cert_chain.pem | 0 .../{ => mbedtls_ut}/main/crts/server_root.pem | 0 .../main/crts/wrong_sig_crt_esp32_com.pem | 0 .../{ => mbedtls_ut}/main/idf_component.yml | 0 .../{ => mbedtls_ut}/main/test_apb_dport_access.c | 0 .../{ => mbedtls_ut}/main/test_apb_dport_access.h | 0 .../main/test_ds_sign_and_decrypt.c | 0 .../test_apps/{ => mbedtls_ut}/main/test_ecp.c | 0 .../{ => mbedtls_ut}/main/test_esp_crt_bundle.c | 0 .../test_apps/{ => mbedtls_ut}/main/test_mbedtls.c | 0 .../{ => mbedtls_ut}/main/test_mbedtls_mpi.c | 0 .../{ => mbedtls_ut}/main/test_mbedtls_utils.c | 0 .../{ => mbedtls_ut}/main/test_mbedtls_utils.h | 0 .../test_apps/{ => mbedtls_ut}/main/test_md5.c | 0 .../test_apps/{ => mbedtls_ut}/main/test_psa_aes.c | 0 .../{ => mbedtls_ut}/main/test_psa_aes_gcm.c | 0 .../{ => mbedtls_ut}/main/test_psa_aes_perf.c | 0 .../main/test_psa_aes_sha_parallel.c | 0 .../{ => mbedtls_ut}/main/test_psa_aes_sha_rsa.c | 0 .../{ => mbedtls_ut}/main/test_psa_cipher.c | 0 .../test_apps/{ => mbedtls_ut}/main/test_psa_cmac.c | 0 .../{ => mbedtls_ut}/main/test_psa_ecdsa.c | 0 .../test_apps/{ => mbedtls_ut}/main/test_psa_gcm.c | 0 .../test_apps/{ => mbedtls_ut}/main/test_psa_hmac.c | 0 .../test_apps/{ => mbedtls_ut}/main/test_psa_rsa.c | 0 .../test_apps/{ => mbedtls_ut}/main/test_psa_sha.c | 0 .../test_apps/{ => mbedtls_ut}/main/test_sha.c | 0 .../test_apps/{ => mbedtls_ut}/main/test_sha_perf.c | 0 .../test_apps/{ => mbedtls_ut}/partitions.csv | 0 .../test_apps/{ => mbedtls_ut}/pytest_mbedtls_ut.py | 0 .../{ => mbedtls_ut}/sdkconfig.ci.aes_no_hw | 0 .../test_apps/{ => mbedtls_ut}/sdkconfig.ci.aria | 0 .../{ => mbedtls_ut}/sdkconfig.ci.cross_signed | 0 .../test_apps/{ => mbedtls_ut}/sdkconfig.ci.default | 0 .../test_apps/{ => mbedtls_ut}/sdkconfig.ci.ds_rsa | 0 .../{ => mbedtls_ut}/sdkconfig.ci.ecdsa_sign | 0 .../{ => mbedtls_ut}/sdkconfig.ci.hmac_opaque | 0 .../{ => mbedtls_ut}/sdkconfig.ci.perf_esp32 | 0 .../test_apps/{ => mbedtls_ut}/sdkconfig.ci.psram | 0 .../{ => mbedtls_ut}/sdkconfig.ci.psram_all_ext | 0 .../sdkconfig.ci.psram_all_ext_flash_enc | 0 .../sdkconfig.ci.psram_all_ext_flash_enc_f4r8 | 0 .../{ => mbedtls_ut}/sdkconfig.ci.rom_impl | 0 .../test_apps/{ => mbedtls_ut}/sdkconfig.defaults | 0 .../{ => mbedtls_ut}/sdkconfig.defaults.esp32 | 0 .../{ => mbedtls_ut}/sdkconfig.defaults.esp32c2 | 0 .../{ => mbedtls_ut}/sdkconfig.defaults.esp32c3 | 0 .../{ => mbedtls_ut}/sdkconfig.defaults.esp32s2 | 0 .../{ => mbedtls_ut}/sdkconfig.defaults.esp32s3 | 0 docs/en/security/security.rst | 2 +- docs/zh_CN/security/security.rst | 2 +- 69 files changed, 5 insertions(+), 5 deletions(-) rename components/mbedtls/test_apps/{ => mbedtls_ut}/CMakeLists.txt (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/README.md (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/ecdsa_key_p192.pem (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/ecdsa_key_p256.pem (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/ecdsa_key_p384.pem (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/include/crypto_performance.h (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/CMakeLists.txt (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/Kconfig.projbuild (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/app_main.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/crts/bad_md_crt.pem (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/crts/correct_sig_crt_esp32_com.pem (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/crts/ecdsa_cert_bundle (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/crts/ecdsa_correct_sig_crt.pem (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/crts/ecdsa_wrong_sig_crt.pem (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/crts/prvtkey.pem (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/crts/server_cert_bundle (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/crts/server_cert_chain.pem (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/crts/server_root.pem (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/crts/wrong_sig_crt_esp32_com.pem (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/idf_component.yml (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_apb_dport_access.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_apb_dport_access.h (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_ds_sign_and_decrypt.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_ecp.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_esp_crt_bundle.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_mbedtls.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_mbedtls_mpi.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_mbedtls_utils.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_mbedtls_utils.h (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_md5.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_psa_aes.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_psa_aes_gcm.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_psa_aes_perf.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_psa_aes_sha_parallel.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_psa_aes_sha_rsa.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_psa_cipher.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_psa_cmac.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_psa_ecdsa.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_psa_gcm.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_psa_hmac.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_psa_rsa.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_psa_sha.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_sha.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/main/test_sha_perf.c (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/partitions.csv (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/pytest_mbedtls_ut.py (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.ci.aes_no_hw (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.ci.aria (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.ci.cross_signed (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.ci.default (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.ci.ds_rsa (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.ci.ecdsa_sign (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.ci.hmac_opaque (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.ci.perf_esp32 (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.ci.psram (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.ci.psram_all_ext (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.ci.psram_all_ext_flash_enc (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.ci.psram_all_ext_flash_enc_f4r8 (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.ci.rom_impl (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.defaults (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.defaults.esp32 (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.defaults.esp32c2 (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.defaults.esp32c3 (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.defaults.esp32s2 (100%) rename components/mbedtls/test_apps/{ => mbedtls_ut}/sdkconfig.defaults.esp32s3 (100%) diff --git a/components/esp_tee/test_apps/tee_test_fw/main/CMakeLists.txt b/components/esp_tee/test_apps/tee_test_fw/main/CMakeLists.txt index e9032a81df7..af0c5563825 100644 --- a/components/esp_tee/test_apps/tee_test_fw/main/CMakeLists.txt +++ b/components/esp_tee/test_apps/tee_test_fw/main/CMakeLists.txt @@ -19,7 +19,7 @@ if(CONFIG_SECURE_TEE_ATTESTATION) list(APPEND srcs "test_esp_tee_att.c") endif() -set(mbedtls_test_srcs_dir "${idf_path}/components/mbedtls/test_apps/main") +set(mbedtls_test_srcs_dir "${idf_path}/components/mbedtls/test_apps/mbedtls_ut/main") #AES if(CONFIG_SOC_AES_SUPPORTED) @@ -50,6 +50,6 @@ list(APPEND srcs "${mbedtls_test_srcs_dir}/test_apb_dport_access.c" "${mbedtls_test_srcs_dir}/test_mbedtls_utils.c") idf_component_register(SRCS ${srcs} - PRIV_INCLUDE_DIRS "${idf_path}/components/mbedtls/test_apps/include" + PRIV_INCLUDE_DIRS "${idf_path}/components/mbedtls/test_apps/mbedtls_ut/include" PRIV_REQUIRES ${priv_requires} WHOLE_ARCHIVE) diff --git a/components/mbedtls/test_apps/.build-test-rules.yml b/components/mbedtls/test_apps/.build-test-rules.yml index 38ecd39d631..ecca00833f6 100644 --- a/components/mbedtls/test_apps/.build-test-rules.yml +++ b/components/mbedtls/test_apps/.build-test-rules.yml @@ -1,6 +1,6 @@ # Documentation: .gitlab/ci/README.md#manifest-file-to-control-the-buildtest-apps -components/mbedtls/test_apps: +components/mbedtls/test_apps/mbedtls_ut: disable: - if: CONFIG_NAME == "aes_no_hw" and SOC_AES_SUPPORTED != 1 - if: CONFIG_NAME == "psram" and SOC_SPIRAM_SUPPORTED != 1 diff --git a/components/mbedtls/test_apps/CMakeLists.txt b/components/mbedtls/test_apps/mbedtls_ut/CMakeLists.txt similarity index 100% rename from components/mbedtls/test_apps/CMakeLists.txt rename to components/mbedtls/test_apps/mbedtls_ut/CMakeLists.txt diff --git a/components/mbedtls/test_apps/README.md b/components/mbedtls/test_apps/mbedtls_ut/README.md similarity index 100% rename from components/mbedtls/test_apps/README.md rename to components/mbedtls/test_apps/mbedtls_ut/README.md diff --git a/components/mbedtls/test_apps/ecdsa_key_p192.pem b/components/mbedtls/test_apps/mbedtls_ut/ecdsa_key_p192.pem similarity index 100% rename from components/mbedtls/test_apps/ecdsa_key_p192.pem rename to components/mbedtls/test_apps/mbedtls_ut/ecdsa_key_p192.pem diff --git a/components/mbedtls/test_apps/ecdsa_key_p256.pem b/components/mbedtls/test_apps/mbedtls_ut/ecdsa_key_p256.pem similarity index 100% rename from components/mbedtls/test_apps/ecdsa_key_p256.pem rename to components/mbedtls/test_apps/mbedtls_ut/ecdsa_key_p256.pem diff --git a/components/mbedtls/test_apps/ecdsa_key_p384.pem b/components/mbedtls/test_apps/mbedtls_ut/ecdsa_key_p384.pem similarity index 100% rename from components/mbedtls/test_apps/ecdsa_key_p384.pem rename to components/mbedtls/test_apps/mbedtls_ut/ecdsa_key_p384.pem diff --git a/components/mbedtls/test_apps/include/crypto_performance.h b/components/mbedtls/test_apps/mbedtls_ut/include/crypto_performance.h similarity index 100% rename from components/mbedtls/test_apps/include/crypto_performance.h rename to components/mbedtls/test_apps/mbedtls_ut/include/crypto_performance.h diff --git a/components/mbedtls/test_apps/main/CMakeLists.txt b/components/mbedtls/test_apps/mbedtls_ut/main/CMakeLists.txt similarity index 100% rename from components/mbedtls/test_apps/main/CMakeLists.txt rename to components/mbedtls/test_apps/mbedtls_ut/main/CMakeLists.txt diff --git a/components/mbedtls/test_apps/main/Kconfig.projbuild b/components/mbedtls/test_apps/mbedtls_ut/main/Kconfig.projbuild similarity index 100% rename from components/mbedtls/test_apps/main/Kconfig.projbuild rename to components/mbedtls/test_apps/mbedtls_ut/main/Kconfig.projbuild diff --git a/components/mbedtls/test_apps/main/app_main.c b/components/mbedtls/test_apps/mbedtls_ut/main/app_main.c similarity index 100% rename from components/mbedtls/test_apps/main/app_main.c rename to components/mbedtls/test_apps/mbedtls_ut/main/app_main.c diff --git a/components/mbedtls/test_apps/main/crts/bad_md_crt.pem b/components/mbedtls/test_apps/mbedtls_ut/main/crts/bad_md_crt.pem similarity index 100% rename from components/mbedtls/test_apps/main/crts/bad_md_crt.pem rename to components/mbedtls/test_apps/mbedtls_ut/main/crts/bad_md_crt.pem diff --git a/components/mbedtls/test_apps/main/crts/correct_sig_crt_esp32_com.pem b/components/mbedtls/test_apps/mbedtls_ut/main/crts/correct_sig_crt_esp32_com.pem similarity index 100% rename from components/mbedtls/test_apps/main/crts/correct_sig_crt_esp32_com.pem rename to components/mbedtls/test_apps/mbedtls_ut/main/crts/correct_sig_crt_esp32_com.pem diff --git a/components/mbedtls/test_apps/main/crts/ecdsa_cert_bundle b/components/mbedtls/test_apps/mbedtls_ut/main/crts/ecdsa_cert_bundle similarity index 100% rename from components/mbedtls/test_apps/main/crts/ecdsa_cert_bundle rename to components/mbedtls/test_apps/mbedtls_ut/main/crts/ecdsa_cert_bundle diff --git a/components/mbedtls/test_apps/main/crts/ecdsa_correct_sig_crt.pem b/components/mbedtls/test_apps/mbedtls_ut/main/crts/ecdsa_correct_sig_crt.pem similarity index 100% rename from components/mbedtls/test_apps/main/crts/ecdsa_correct_sig_crt.pem rename to components/mbedtls/test_apps/mbedtls_ut/main/crts/ecdsa_correct_sig_crt.pem diff --git a/components/mbedtls/test_apps/main/crts/ecdsa_wrong_sig_crt.pem b/components/mbedtls/test_apps/mbedtls_ut/main/crts/ecdsa_wrong_sig_crt.pem similarity index 100% rename from components/mbedtls/test_apps/main/crts/ecdsa_wrong_sig_crt.pem rename to components/mbedtls/test_apps/mbedtls_ut/main/crts/ecdsa_wrong_sig_crt.pem diff --git a/components/mbedtls/test_apps/main/crts/prvtkey.pem b/components/mbedtls/test_apps/mbedtls_ut/main/crts/prvtkey.pem similarity index 100% rename from components/mbedtls/test_apps/main/crts/prvtkey.pem rename to components/mbedtls/test_apps/mbedtls_ut/main/crts/prvtkey.pem diff --git a/components/mbedtls/test_apps/main/crts/server_cert_bundle b/components/mbedtls/test_apps/mbedtls_ut/main/crts/server_cert_bundle similarity index 100% rename from components/mbedtls/test_apps/main/crts/server_cert_bundle rename to components/mbedtls/test_apps/mbedtls_ut/main/crts/server_cert_bundle diff --git a/components/mbedtls/test_apps/main/crts/server_cert_chain.pem b/components/mbedtls/test_apps/mbedtls_ut/main/crts/server_cert_chain.pem similarity index 100% rename from components/mbedtls/test_apps/main/crts/server_cert_chain.pem rename to components/mbedtls/test_apps/mbedtls_ut/main/crts/server_cert_chain.pem diff --git a/components/mbedtls/test_apps/main/crts/server_root.pem b/components/mbedtls/test_apps/mbedtls_ut/main/crts/server_root.pem similarity index 100% rename from components/mbedtls/test_apps/main/crts/server_root.pem rename to components/mbedtls/test_apps/mbedtls_ut/main/crts/server_root.pem diff --git a/components/mbedtls/test_apps/main/crts/wrong_sig_crt_esp32_com.pem b/components/mbedtls/test_apps/mbedtls_ut/main/crts/wrong_sig_crt_esp32_com.pem similarity index 100% rename from components/mbedtls/test_apps/main/crts/wrong_sig_crt_esp32_com.pem rename to components/mbedtls/test_apps/mbedtls_ut/main/crts/wrong_sig_crt_esp32_com.pem diff --git a/components/mbedtls/test_apps/main/idf_component.yml b/components/mbedtls/test_apps/mbedtls_ut/main/idf_component.yml similarity index 100% rename from components/mbedtls/test_apps/main/idf_component.yml rename to components/mbedtls/test_apps/mbedtls_ut/main/idf_component.yml diff --git a/components/mbedtls/test_apps/main/test_apb_dport_access.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_apb_dport_access.c similarity index 100% rename from components/mbedtls/test_apps/main/test_apb_dport_access.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_apb_dport_access.c diff --git a/components/mbedtls/test_apps/main/test_apb_dport_access.h b/components/mbedtls/test_apps/mbedtls_ut/main/test_apb_dport_access.h similarity index 100% rename from components/mbedtls/test_apps/main/test_apb_dport_access.h rename to components/mbedtls/test_apps/mbedtls_ut/main/test_apb_dport_access.h diff --git a/components/mbedtls/test_apps/main/test_ds_sign_and_decrypt.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_ds_sign_and_decrypt.c similarity index 100% rename from components/mbedtls/test_apps/main/test_ds_sign_and_decrypt.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_ds_sign_and_decrypt.c diff --git a/components/mbedtls/test_apps/main/test_ecp.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_ecp.c similarity index 100% rename from components/mbedtls/test_apps/main/test_ecp.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_ecp.c diff --git a/components/mbedtls/test_apps/main/test_esp_crt_bundle.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_esp_crt_bundle.c similarity index 100% rename from components/mbedtls/test_apps/main/test_esp_crt_bundle.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_esp_crt_bundle.c diff --git a/components/mbedtls/test_apps/main/test_mbedtls.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_mbedtls.c similarity index 100% rename from components/mbedtls/test_apps/main/test_mbedtls.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_mbedtls.c diff --git a/components/mbedtls/test_apps/main/test_mbedtls_mpi.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_mbedtls_mpi.c similarity index 100% rename from components/mbedtls/test_apps/main/test_mbedtls_mpi.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_mbedtls_mpi.c diff --git a/components/mbedtls/test_apps/main/test_mbedtls_utils.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_mbedtls_utils.c similarity index 100% rename from components/mbedtls/test_apps/main/test_mbedtls_utils.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_mbedtls_utils.c diff --git a/components/mbedtls/test_apps/main/test_mbedtls_utils.h b/components/mbedtls/test_apps/mbedtls_ut/main/test_mbedtls_utils.h similarity index 100% rename from components/mbedtls/test_apps/main/test_mbedtls_utils.h rename to components/mbedtls/test_apps/mbedtls_ut/main/test_mbedtls_utils.h diff --git a/components/mbedtls/test_apps/main/test_md5.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_md5.c similarity index 100% rename from components/mbedtls/test_apps/main/test_md5.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_md5.c diff --git a/components/mbedtls/test_apps/main/test_psa_aes.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_aes.c similarity index 100% rename from components/mbedtls/test_apps/main/test_psa_aes.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_psa_aes.c diff --git a/components/mbedtls/test_apps/main/test_psa_aes_gcm.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_aes_gcm.c similarity index 100% rename from components/mbedtls/test_apps/main/test_psa_aes_gcm.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_psa_aes_gcm.c diff --git a/components/mbedtls/test_apps/main/test_psa_aes_perf.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_aes_perf.c similarity index 100% rename from components/mbedtls/test_apps/main/test_psa_aes_perf.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_psa_aes_perf.c diff --git a/components/mbedtls/test_apps/main/test_psa_aes_sha_parallel.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_aes_sha_parallel.c similarity index 100% rename from components/mbedtls/test_apps/main/test_psa_aes_sha_parallel.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_psa_aes_sha_parallel.c diff --git a/components/mbedtls/test_apps/main/test_psa_aes_sha_rsa.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_aes_sha_rsa.c similarity index 100% rename from components/mbedtls/test_apps/main/test_psa_aes_sha_rsa.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_psa_aes_sha_rsa.c diff --git a/components/mbedtls/test_apps/main/test_psa_cipher.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_cipher.c similarity index 100% rename from components/mbedtls/test_apps/main/test_psa_cipher.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_psa_cipher.c diff --git a/components/mbedtls/test_apps/main/test_psa_cmac.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_cmac.c similarity index 100% rename from components/mbedtls/test_apps/main/test_psa_cmac.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_psa_cmac.c diff --git a/components/mbedtls/test_apps/main/test_psa_ecdsa.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_ecdsa.c similarity index 100% rename from components/mbedtls/test_apps/main/test_psa_ecdsa.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_psa_ecdsa.c diff --git a/components/mbedtls/test_apps/main/test_psa_gcm.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_gcm.c similarity index 100% rename from components/mbedtls/test_apps/main/test_psa_gcm.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_psa_gcm.c diff --git a/components/mbedtls/test_apps/main/test_psa_hmac.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_hmac.c similarity index 100% rename from components/mbedtls/test_apps/main/test_psa_hmac.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_psa_hmac.c diff --git a/components/mbedtls/test_apps/main/test_psa_rsa.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_rsa.c similarity index 100% rename from components/mbedtls/test_apps/main/test_psa_rsa.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_psa_rsa.c diff --git a/components/mbedtls/test_apps/main/test_psa_sha.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_psa_sha.c similarity index 100% rename from components/mbedtls/test_apps/main/test_psa_sha.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_psa_sha.c diff --git a/components/mbedtls/test_apps/main/test_sha.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_sha.c similarity index 100% rename from components/mbedtls/test_apps/main/test_sha.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_sha.c diff --git a/components/mbedtls/test_apps/main/test_sha_perf.c b/components/mbedtls/test_apps/mbedtls_ut/main/test_sha_perf.c similarity index 100% rename from components/mbedtls/test_apps/main/test_sha_perf.c rename to components/mbedtls/test_apps/mbedtls_ut/main/test_sha_perf.c diff --git a/components/mbedtls/test_apps/partitions.csv b/components/mbedtls/test_apps/mbedtls_ut/partitions.csv similarity index 100% rename from components/mbedtls/test_apps/partitions.csv rename to components/mbedtls/test_apps/mbedtls_ut/partitions.csv diff --git a/components/mbedtls/test_apps/pytest_mbedtls_ut.py b/components/mbedtls/test_apps/mbedtls_ut/pytest_mbedtls_ut.py similarity index 100% rename from components/mbedtls/test_apps/pytest_mbedtls_ut.py rename to components/mbedtls/test_apps/mbedtls_ut/pytest_mbedtls_ut.py diff --git a/components/mbedtls/test_apps/sdkconfig.ci.aes_no_hw b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.aes_no_hw similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.ci.aes_no_hw rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.aes_no_hw diff --git a/components/mbedtls/test_apps/sdkconfig.ci.aria b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.aria similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.ci.aria rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.aria diff --git a/components/mbedtls/test_apps/sdkconfig.ci.cross_signed b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.cross_signed similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.ci.cross_signed rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.cross_signed diff --git a/components/mbedtls/test_apps/sdkconfig.ci.default b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.default similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.ci.default rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.default diff --git a/components/mbedtls/test_apps/sdkconfig.ci.ds_rsa b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.ds_rsa similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.ci.ds_rsa rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.ds_rsa diff --git a/components/mbedtls/test_apps/sdkconfig.ci.ecdsa_sign b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.ecdsa_sign similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.ci.ecdsa_sign rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.ecdsa_sign diff --git a/components/mbedtls/test_apps/sdkconfig.ci.hmac_opaque b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.hmac_opaque similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.ci.hmac_opaque rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.hmac_opaque diff --git a/components/mbedtls/test_apps/sdkconfig.ci.perf_esp32 b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.perf_esp32 similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.ci.perf_esp32 rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.perf_esp32 diff --git a/components/mbedtls/test_apps/sdkconfig.ci.psram b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.psram similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.ci.psram rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.psram diff --git a/components/mbedtls/test_apps/sdkconfig.ci.psram_all_ext b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.psram_all_ext similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.ci.psram_all_ext rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.psram_all_ext diff --git a/components/mbedtls/test_apps/sdkconfig.ci.psram_all_ext_flash_enc b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.psram_all_ext_flash_enc similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.ci.psram_all_ext_flash_enc rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.psram_all_ext_flash_enc diff --git a/components/mbedtls/test_apps/sdkconfig.ci.psram_all_ext_flash_enc_f4r8 b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.psram_all_ext_flash_enc_f4r8 similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.ci.psram_all_ext_flash_enc_f4r8 rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.psram_all_ext_flash_enc_f4r8 diff --git a/components/mbedtls/test_apps/sdkconfig.ci.rom_impl b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.rom_impl similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.ci.rom_impl rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.ci.rom_impl diff --git a/components/mbedtls/test_apps/sdkconfig.defaults b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.defaults similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.defaults rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.defaults diff --git a/components/mbedtls/test_apps/sdkconfig.defaults.esp32 b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.defaults.esp32 similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.defaults.esp32 rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.defaults.esp32 diff --git a/components/mbedtls/test_apps/sdkconfig.defaults.esp32c2 b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.defaults.esp32c2 similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.defaults.esp32c2 rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.defaults.esp32c2 diff --git a/components/mbedtls/test_apps/sdkconfig.defaults.esp32c3 b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.defaults.esp32c3 similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.defaults.esp32c3 rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.defaults.esp32c3 diff --git a/components/mbedtls/test_apps/sdkconfig.defaults.esp32s2 b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.defaults.esp32s2 similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.defaults.esp32s2 rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.defaults.esp32s2 diff --git a/components/mbedtls/test_apps/sdkconfig.defaults.esp32s3 b/components/mbedtls/test_apps/mbedtls_ut/sdkconfig.defaults.esp32s3 similarity index 100% rename from components/mbedtls/test_apps/sdkconfig.defaults.esp32s3 rename to components/mbedtls/test_apps/mbedtls_ut/sdkconfig.defaults.esp32s3 diff --git a/docs/en/security/security.rst b/docs/en/security/security.rst index f6d97911da7..2f47efa117b 100644 --- a/docs/en/security/security.rst +++ b/docs/en/security/security.rst @@ -175,7 +175,7 @@ Flash Encryption Best Practices * - High - 72.4 % - .. [#] The above performance numbers have been calculated using the AES performance test of the mbedtls test application :component_file:`test_psa_aes_perf.c `. + .. [#] The above performance numbers have been calculated using the AES performance test of the mbedtls test application :component_file:`test_psa_aes_perf.c `. Considering the above performance impact, ESP-IDF by-default does not enable the pseudo-round function to avoid any performance-related degrade. But it is recommended to enable the pseudo-round function for better security. diff --git a/docs/zh_CN/security/security.rst b/docs/zh_CN/security/security.rst index 1d82a8ec583..2602ec01b14 100644 --- a/docs/zh_CN/security/security.rst +++ b/docs/zh_CN/security/security.rst @@ -175,7 +175,7 @@ flash 加密最佳实践 * - 高 - 72.4 % - .. [#] 上述性能数据通过 mbedtls 测试应用中的 AES 性能测试 :component_file:`test_psa_aes_perf.c ` 计算得出。 + .. [#] 上述性能数据通过 mbedtls 测试应用中的 AES 性能测试 :component_file:`test_psa_aes_perf.c ` 计算得出。 考虑到上述性能影响，ESP-IDF 默认关闭伪轮次功能，避免对相关性能造成影响。但如果需要更高的安全性，仍然建议启用。