Skip to content

Commit 22da5f6

Browse files
committed
Merge branch 'bugfix/btdm_security_vulnerability_v3.1' into 'release/v3.1'
fix bluetooth security vulnerability of ECDH public key checking See merge request idf/esp-idf!3139
2 parents 0ec9d3e + 7f8de47 commit 22da5f6

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

components/bt/lib

Submodule lib updated 1 file

components/esp32/ld/esp32.rom.ld

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -273,6 +273,9 @@ PROVIDE ( r_E1 = 0x400108e8 );
273273
PROVIDE ( r_E21 = 0x40010968 );
274274
PROVIDE ( r_E22 = 0x400109b4 );
275275
PROVIDE ( r_E3 = 0x40010a58 );
276+
PROVIDE ( lm_n192_mod_mul = 0x40011dc0 );
277+
PROVIDE ( lm_n192_mod_add = 0x40011e9c );
278+
PROVIDE ( lm_n192_mod_sub = 0x40011eec );
276279
PROVIDE ( r_ea_alarm_clear = 0x40015ab4 );
277280
PROVIDE ( r_ea_alarm_set = 0x40015a10 );
278281
PROVIDE ( _read_r = 0x4000bda8 );
@@ -302,6 +305,7 @@ PROVIDE ( r_ecc_gen_new_public_key = 0x400170c0 );
302305
PROVIDE ( r_ecc_gen_new_secret_key = 0x400170e4 );
303306
PROVIDE ( r_ecc_get_debug_Keys = 0x40017224 );
304307
PROVIDE ( r_ecc_init = 0x40016dbc );
308+
PROVIDE ( ecc_point_multiplication_uint8_256 = 0x40016804);
305309
PROVIDE ( RecvBuff = 0x3ffe009c );
306310
PROVIDE ( r_em_buf_init = 0x4001729c );
307311
PROVIDE ( r_em_buf_rx_buff_addr_get = 0x400173e8 );
@@ -600,6 +604,14 @@ PROVIDE ( r_lc_util_get_offset_clke = 0x4002f538 );
600604
PROVIDE ( r_lc_util_get_offset_clkn = 0x4002f51c );
601605
PROVIDE ( r_lc_util_set_loc_trans_coll = 0x4002f500 );
602606
PROVIDE ( r_lc_version = 0x40020a30 );
607+
PROVIDE ( lc_set_encap_pdu_data_p192 = 0x4002e4c8 );
608+
PROVIDE ( lc_set_encap_pdu_data_p256 = 0x4002e454 );
609+
PROVIDE ( lm_get_auth_method = 0x40023420);
610+
PROVIDE ( lmp_accepted_ext_handler = 0x40027290 );
611+
PROVIDE ( lmp_not_accepted_ext_handler = 0x40029c54 );
612+
PROVIDE ( lmp_clk_adj_handler = 0x40027468 );
613+
PROVIDE ( lmp_clk_adj_ack_handler = 0x400274f4 );
614+
PROVIDE ( lm_get_auth_method = 0x40023420);
603615
PROVIDE ( lmp_accepted_ext_handler = 0x40027290 );
604616
PROVIDE ( lmp_not_accepted_ext_handler = 0x40029c54 );
605617
PROVIDE ( lmp_clk_adj_handler = 0x40027468 );

0 commit comments

Comments
 (0)