Skip to content

Commit 80106f5

Browse files
committed
Merge branch 'bugfix/fix_esp32c2_rom_eco1_mbedtls_issues' into 'master'
fix(esp_rom): Fixed esp32c2 rom eco1 mbedtls issues See merge request espressif/esp-idf!33889
2 parents 2b97653 + c97b7f6 commit 80106f5

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.eco4.ld

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,16 @@ mbedtls_mpi_gcd = 0x40002768;
4848
mbedtls_mpi_inv_mod = 0x4000276c;
4949
mbedtls_mpi_is_prime_ext = 0x40002770;
5050

51+
/* Moved from mbedtls.ld to mbedtls.eco4 ld */
52+
mbedtls_cipher_init = 0x4000277c;
53+
mbedtls_cipher_set_padding_mode = 0x40002780;
54+
mbedtls_cipher_reset = 0x40002784;
55+
mbedtls_cipher_finish = 0x40002788;
56+
mbedtls_cipher_crypt = 0x4000278c;
57+
mbedtls_cipher_cmac_starts = 0x40002790;
58+
mbedtls_cipher_cmac_update = 0x40002794;
59+
mbedtls_cipher_cmac_finish = 0x40002798;
60+
5161
/***************************************
5262
Group eco4_rom_mbedtls
5363
***************************************/

components/esp_rom/esp32c2/ld/esp32c2.rom.mbedtls.ld

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2021-2023 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2021-2024 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -43,14 +43,6 @@ mbedtls_asn1_write_mpi = 0x400026d4;
4343
mbedtls_base64_decode = 0x400026d8;
4444
mbedtls_ccm_star_encrypt_and_tag = 0x40002774;
4545
mbedtls_ccm_star_auth_decrypt = 0x40002778;
46-
mbedtls_cipher_init = 0x4000277c;
47-
mbedtls_cipher_set_padding_mode = 0x40002780;
48-
mbedtls_cipher_reset = 0x40002784;
49-
mbedtls_cipher_finish = 0x40002788;
50-
mbedtls_cipher_crypt = 0x4000278c;
51-
mbedtls_cipher_cmac_starts = 0x40002790;
52-
mbedtls_cipher_cmac_update = 0x40002794;
53-
mbedtls_cipher_cmac_finish = 0x40002798;
5446
mbedtls_ctr_drbg_init = 0x4000279c;
5547
mbedtls_ctr_drbg_seed = 0x400027a0;
5648
mbedtls_ctr_drbg_free = 0x400027a4;

0 commit comments

Comments
 (0)