Skip to content

Commit c5fc205

Browse files
committed
Merge branch 'fix/coredump_sha_build_error' into 'master'
fix(esp-coredump): fix build error when mbedtls hardware sha disabled See merge request espressif/esp-idf!33841
2 parents 07400d3 + 13c8c2f commit c5fc205

File tree

3 files changed

+8
-0
lines changed

3 files changed

+8
-0
lines changed

components/espcoredump/src/core_dump_sha.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,9 @@ static void core_dump_sha256_start(core_dump_sha_ctx_t *sha_ctx)
3131
static void core_dump_sha256_update(core_dump_sha_ctx_t *sha_ctx, const void *data, size_t data_len)
3232
{
3333
// set software mode of SHA calculation
34+
#if CONFIG_MBEDTLS_HARDWARE_SHA
3435
sha_ctx->ctx.mode = ESP_MBEDTLS_SHA256_SOFTWARE;
36+
#endif
3537
mbedtls_sha256_update(&sha_ctx->ctx, data, data_len);
3638
}
3739

tools/test_apps/system/panic/pytest_panic.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
CONFIGS = [
5151
pytest.param('coredump_flash_bin_crc', marks=TARGETS_ALL),
5252
pytest.param('coredump_flash_elf_sha', marks=TARGETS_ALL),
53+
pytest.param('coredump_flash_elf_soft_sha', marks=TARGETS_ALL),
5354
pytest.param('coredump_uart_bin_crc', marks=TARGETS_ALL),
5455
pytest.param('coredump_uart_elf_crc', marks=TARGETS_ALL),
5556
pytest.param('coredump_flash_custom_stack', marks=TARGETS_RISCV),
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
CONFIG_ESP_COREDUMP_ENABLE_TO_FLASH=y
2+
CONFIG_ESP_COREDUMP_DATA_FORMAT_ELF=y
3+
CONFIG_ESP_COREDUMP_CHECKSUM_SHA256=y
4+
CONFIG_LOG_DEFAULT_LEVEL_INFO=y
5+
CONFIG_MBEDTLS_HARDWARE_SHA=n

0 commit comments

Comments
 (0)