Merge branch 'fix/coredump_sha_build_error_v5.1' into 'release/v5.1'

fix(esp-coredump): fix build error when mbedtls hardware sha disabled (v5.1) See merge request espressif/esp-idf!33945
espressif · Oct 8, 2024 · 632e0c2 · 632e0c2
2 parents 7b395bd + 0e6dca5
commit 632e0c2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/components/espcoredump/src/core_dump_sha.c b/components/espcoredump/src/core_dump_sha.c
@@ -31,7 +31,9 @@ static void core_dump_sha256_start(core_dump_sha_ctx_t *sha_ctx)
 static void core_dump_sha256_update(core_dump_sha_ctx_t *sha_ctx, const void *data, size_t data_len)
 {
     // set software mode of SHA calculation
+#if CONFIG_MBEDTLS_HARDWARE_SHA
     sha_ctx->ctx.mode = ESP_MBEDTLS_SHA256_SOFTWARE;
+#endif
     mbedtls_sha256_update(&sha_ctx->ctx, data, data_len);
 }
 

diff --git a/tools/test_apps/system/panic/pytest_panic.py b/tools/test_apps/system/panic/pytest_panic.py
@@ -27,6 +27,7 @@
 CONFIGS = [
     pytest.param('coredump_flash_bin_crc', marks=TARGETS_TESTED),
     pytest.param('coredump_flash_elf_sha', marks=TARGETS_TESTED),
+    pytest.param('coredump_flash_elf_soft_sha', marks=TARGETS_TESTED),
     pytest.param('coredump_uart_bin_crc', marks=TARGETS_TESTED),
     pytest.param('coredump_uart_elf_crc', marks=TARGETS_TESTED),
     pytest.param('gdbstub', marks=TARGETS_TESTED),

diff --git a/tools/test_apps/system/panic/sdkconfig.ci.coredump_flash_elf_soft_sha b/tools/test_apps/system/panic/sdkconfig.ci.coredump_flash_elf_soft_sha
@@ -0,0 +1,5 @@
+CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=y
+CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=y
+CONFIG_ESP_COREDUMP_CHECKSUM_SHA256=y
+CONFIG_LOG_DEFAULT_LEVEL_INFO=y
+CONFIG_MBEDTLS_HARDWARE_SHA=n