Skip to content

Commit

Permalink
Merge branch 'bugfix/fix_esp32c2_rom_eco1_mbedtls_issues_v5.3' into '…
Browse files Browse the repository at this point in the history
…release/v5.3'

fix(esp_rom): Fixed esp32c2 rom eco1 mbedtls issues (v5.3)

See merge request espressif/esp-idf!33917
  • Loading branch information
jack0c committed Sep 30, 2024
2 parents 6df7db6 + fad9341 commit 98440e1
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 9 deletions.
10 changes: 10 additions & 0 deletions components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.eco4.ld
Original file line number Diff line number Diff line change
Expand Up @@ -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
***************************************/
Expand Down
10 changes: 1 addition & 9 deletions components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.ld
Original file line number Diff line number Diff line change
@@ -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
*/
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 98440e1

Please sign in to comment.