Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/btdm_fix_save_error_key_in_smp_when_reconnect_v3.1' into 'release/v3.1'

Browse source 
Component/bt: fix save error key in smp when reconnect(backport v3.1)

See merge request idf/esp-idf!3289
This commit is contained in:
Jiang Jiang Jian 2018-09-20 10:58:01 +08:00
commit e8aa442305
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
components/bt/bluedroid/btc/core/btc_dm.c
View file

@ -197,6 +197,7 @@ static void btc_dm_save_ble_bonding_keys(void)
(char *) &pairing_cb.ble.penc_key, (char *) &pairing_cb.ble.penc_key,
BTM_LE_KEY_PENC, BTM_LE_KEY_PENC,
sizeof(tBTM_LE_PENC_KEYS)); sizeof(tBTM_LE_PENC_KEYS));
pairing_cb.ble.is_penc_key_rcvd = false;
} }
if (pairing_cb.ble.is_pid_key_rcvd) { if (pairing_cb.ble.is_pid_key_rcvd) {
@ -204,6 +205,7 @@ static void btc_dm_save_ble_bonding_keys(void)
(char *) &pairing_cb.ble.pid_key, (char *) &pairing_cb.ble.pid_key,
BTM_LE_KEY_PID, BTM_LE_KEY_PID,
sizeof(tBTM_LE_PID_KEYS)); sizeof(tBTM_LE_PID_KEYS));
pairing_cb.ble.is_pid_key_rcvd = false;
} }
@ -212,6 +214,7 @@ static void btc_dm_save_ble_bonding_keys(void)
(char *) &pairing_cb.ble.pcsrk_key, (char *) &pairing_cb.ble.pcsrk_key,
BTM_LE_KEY_PCSRK, BTM_LE_KEY_PCSRK,
sizeof(tBTM_LE_PCSRK_KEYS)); sizeof(tBTM_LE_PCSRK_KEYS));
pairing_cb.ble.is_pcsrk_key_rcvd = false;
} }
@ -220,6 +223,7 @@ static void btc_dm_save_ble_bonding_keys(void)
(char *) &pairing_cb.ble.lenc_key, (char *) &pairing_cb.ble.lenc_key,
BTM_LE_KEY_LENC, BTM_LE_KEY_LENC,
sizeof(tBTM_LE_LENC_KEYS)); sizeof(tBTM_LE_LENC_KEYS));
pairing_cb.ble.is_lenc_key_rcvd = false;
} }
if (pairing_cb.ble.is_lcsrk_key_rcvd) { if (pairing_cb.ble.is_lcsrk_key_rcvd) {
@ -227,6 +231,7 @@ static void btc_dm_save_ble_bonding_keys(void)
(char *) &pairing_cb.ble.lcsrk_key, (char *) &pairing_cb.ble.lcsrk_key,
BTM_LE_KEY_LCSRK, BTM_LE_KEY_LCSRK,
sizeof(tBTM_LE_LCSRK_KEYS)); sizeof(tBTM_LE_LCSRK_KEYS));
pairing_cb.ble.is_lcsrk_key_rcvd = false;
} }
if (pairing_cb.ble.is_lidk_key_rcvd) { if (pairing_cb.ble.is_lidk_key_rcvd) {
@ -234,6 +239,7 @@ static void btc_dm_save_ble_bonding_keys(void)
NULL, NULL,
BTM_LE_KEY_LID, BTM_LE_KEY_LID,
0); 0);
pairing_cb.ble.is_lidk_key_rcvd = false;
} }
} }