espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-02 20:24:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/btdm_smp_invalid_key_size' into 'master'

Browse Source 
component/bt: Change the SMP key size analyzing conditions.

See merge request !958
This commit is contained in:
Jiang Jiang Jian
2017-08-21 19:38:15 +08:00
parent 44e9be5d83 c5ea00c727
commit 5c9d9ae696
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/bt/bluedroid/btif/bta_dm_co.c
View File

@@ -403,7 +403,6 @@ void bta_dm_co_ble_load_local_keys(tBTA_DM_BLE_LOCAL_KEY_MASK *p_key_mask, BT_OC
#endif ///defined(BTIF_INCLUDED) && BTIF_INCLUDED == TRUE #endif ///defined(BTIF_INCLUDED) && BTIF_INCLUDED == TRUE
#if (SMP_INCLUDED == TRUE) #if (SMP_INCLUDED == TRUE)
btc_dm_get_ble_local_keys( p_key_mask, er, p_id_keys); btc_dm_get_ble_local_keys( p_key_mask, er, p_id_keys);
BTIF_TRACE_DEBUG("bta_dm_co_ble_load_local_keys: func not ported\n");
#endif ///SMP_INCLUDED == TRUE #endif ///SMP_INCLUDED == TRUE
} }
@@ -502,7 +501,7 @@ void bta_dm_co_ble_set_rsp_key_req(UINT8 rsp_key)
void bta_dm_co_ble_set_max_key_size(UINT8 ble_key_size) void bta_dm_co_ble_set_max_key_size(UINT8 ble_key_size)
{ {
#if (SMP_INCLUDED == TRUE) #if (SMP_INCLUDED == TRUE)
if(ble_key_size > 7 && ble_key_size >= 16) { if(ble_key_size >= BTM_BLE_MIN_KEY_SIZE && ble_key_size <= BTM_BLE_MAX_KEY_SIZE) {
bte_appl_cfg.ble_max_key_size = ble_key_size; bte_appl_cfg.ble_max_key_size = ble_key_size;
} else { } else {
APPL_TRACE_ERROR("%s error:Invalid key size value, key_size =%d",__func__, ble_key_size); APPL_TRACE_ERROR("%s error:Invalid key size value, key_size =%d",__func__, ble_key_size);

1
components/bt/bluedroid/stack/include/btm_api.h
View File

@@ -1416,6 +1416,7 @@ typedef UINT8 tBTM_IO_CAP;
#define BTM_BLE_INITIATOR_KEY_SIZE 15 #define BTM_BLE_INITIATOR_KEY_SIZE 15
#define BTM_BLE_RESPONDER_KEY_SIZE 15 #define BTM_BLE_RESPONDER_KEY_SIZE 15
#define BTM_BLE_MAX_KEY_SIZE 16 #define BTM_BLE_MAX_KEY_SIZE 16
#define BTM_BLE_MIN_KEY_SIZE 7
typedef UINT8 tBTM_AUTH_REQ; typedef UINT8 tBTM_AUTH_REQ;