Skip to content

Commit

Permalink
Merge branch 'bugfix/btdm_security_vulnerability_v3.1' into 'release/…
Browse files Browse the repository at this point in the history
…v3.1'

fix bluetooth security vulnerability of ECDH public key checking

See merge request idf/esp-idf!3139
  • Loading branch information
jack0c committed Aug 30, 2018
2 parents 0ec9d3e + 7f8de47 commit 22da5f6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
2 changes: 1 addition & 1 deletion components/bt/lib
Submodule lib updated 1 files
+ libbtdm_app.a
12 changes: 12 additions & 0 deletions components/esp32/ld/esp32.rom.ld
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,9 @@ PROVIDE ( r_E1 = 0x400108e8 );
PROVIDE ( r_E21 = 0x40010968 );
PROVIDE ( r_E22 = 0x400109b4 );
PROVIDE ( r_E3 = 0x40010a58 );
PROVIDE ( lm_n192_mod_mul = 0x40011dc0 );
PROVIDE ( lm_n192_mod_add = 0x40011e9c );
PROVIDE ( lm_n192_mod_sub = 0x40011eec );
PROVIDE ( r_ea_alarm_clear = 0x40015ab4 );
PROVIDE ( r_ea_alarm_set = 0x40015a10 );
PROVIDE ( _read_r = 0x4000bda8 );
Expand Down Expand Up @@ -302,6 +305,7 @@ PROVIDE ( r_ecc_gen_new_public_key = 0x400170c0 );
PROVIDE ( r_ecc_gen_new_secret_key = 0x400170e4 );
PROVIDE ( r_ecc_get_debug_Keys = 0x40017224 );
PROVIDE ( r_ecc_init = 0x40016dbc );
PROVIDE ( ecc_point_multiplication_uint8_256 = 0x40016804);
PROVIDE ( RecvBuff = 0x3ffe009c );
PROVIDE ( r_em_buf_init = 0x4001729c );
PROVIDE ( r_em_buf_rx_buff_addr_get = 0x400173e8 );
Expand Down Expand Up @@ -600,6 +604,14 @@ PROVIDE ( r_lc_util_get_offset_clke = 0x4002f538 );
PROVIDE ( r_lc_util_get_offset_clkn = 0x4002f51c );
PROVIDE ( r_lc_util_set_loc_trans_coll = 0x4002f500 );
PROVIDE ( r_lc_version = 0x40020a30 );
PROVIDE ( lc_set_encap_pdu_data_p192 = 0x4002e4c8 );
PROVIDE ( lc_set_encap_pdu_data_p256 = 0x4002e454 );
PROVIDE ( lm_get_auth_method = 0x40023420);
PROVIDE ( lmp_accepted_ext_handler = 0x40027290 );
PROVIDE ( lmp_not_accepted_ext_handler = 0x40029c54 );
PROVIDE ( lmp_clk_adj_handler = 0x40027468 );
PROVIDE ( lmp_clk_adj_ack_handler = 0x400274f4 );
PROVIDE ( lm_get_auth_method = 0x40023420);
PROVIDE ( lmp_accepted_ext_handler = 0x40027290 );
PROVIDE ( lmp_not_accepted_ext_handler = 0x40029c54 );
PROVIDE ( lmp_clk_adj_handler = 0x40027468 );
Expand Down

0 comments on commit 22da5f6

Please sign in to comment.