From 5dd3f332ca3b3fca142b9494868d61bc8cf61d60 Mon Sep 17 00:00:00 2001 From: Jiang Guang Ming Date: Fri, 27 Sep 2024 18:10:06 +0800 Subject: [PATCH] fix(esp_rom): Fixed esp32c2 rom eco1 mbedtls issues --- .../esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.eco4.ld | 10 ++++++++++ components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.ld | 10 +--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.eco4.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.eco4.ld index ee70068dab..fe893c335a 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.eco4.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.eco4.ld @@ -48,6 +48,16 @@ mbedtls_mpi_gcd = 0x40002768; mbedtls_mpi_inv_mod = 0x4000276c; mbedtls_mpi_is_prime_ext = 0x40002770; +/* Moved from mbedtls.ld to mbedtls.eco4 ld */ +mbedtls_cipher_init = 0x4000277c; +mbedtls_cipher_set_padding_mode = 0x40002780; +mbedtls_cipher_reset = 0x40002784; +mbedtls_cipher_finish = 0x40002788; +mbedtls_cipher_crypt = 0x4000278c; +mbedtls_cipher_cmac_starts = 0x40002790; +mbedtls_cipher_cmac_update = 0x40002794; +mbedtls_cipher_cmac_finish = 0x40002798; + /*************************************** Group eco4_rom_mbedtls ***************************************/ diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.ld index f81555d140..20182027d6 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.ld @@ -1,5 +1,5 @@ /* - * SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD + * SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD * * SPDX-License-Identifier: Apache-2.0 */ @@ -43,14 +43,6 @@ mbedtls_asn1_write_mpi = 0x400026d4; mbedtls_base64_decode = 0x400026d8; mbedtls_ccm_star_encrypt_and_tag = 0x40002774; mbedtls_ccm_star_auth_decrypt = 0x40002778; -mbedtls_cipher_init = 0x4000277c; -mbedtls_cipher_set_padding_mode = 0x40002780; -mbedtls_cipher_reset = 0x40002784; -mbedtls_cipher_finish = 0x40002788; -mbedtls_cipher_crypt = 0x4000278c; -mbedtls_cipher_cmac_starts = 0x40002790; -mbedtls_cipher_cmac_update = 0x40002794; -mbedtls_cipher_cmac_finish = 0x40002798; mbedtls_ctr_drbg_init = 0x4000279c; mbedtls_ctr_drbg_seed = 0x400027a0; mbedtls_ctr_drbg_free = 0x400027a4;