From 677f58577f680f925162451b7193b5155149a323 Mon Sep 17 00:00:00 2001 From: Yulong Date: Wed, 5 Jul 2017 23:02:54 -0400 Subject: [PATCH 1/3] component/bt: Change the SMP key size analyzing conditions. --- components/bt/bluedroid/btif/bta_dm_co.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/bluedroid/btif/bta_dm_co.c b/components/bt/bluedroid/btif/bta_dm_co.c index d14123e823..38002fae07 100644 --- a/components/bt/bluedroid/btif/bta_dm_co.c +++ b/components/bt/bluedroid/btif/bta_dm_co.c @@ -502,7 +502,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) { #if (SMP_INCLUDED == TRUE) - if(ble_key_size > 7 && ble_key_size >= 16) { + if(ble_key_size >= 7 && ble_key_size >= 16) { bte_appl_cfg.ble_max_key_size = ble_key_size; } else { APPL_TRACE_ERROR("%s error:Invalid key size value, key_size =%d",__func__, ble_key_size); From eebc2e2df19ac65eef7dbbd942d6e670608c62b9 Mon Sep 17 00:00:00 2001 From: Yulong Date: Tue, 8 Aug 2017 04:51:18 -0400 Subject: [PATCH 2/3] component/bt: Change the btm ble security key size range. --- components/bt/bluedroid/btif/bta_dm_co.c | 2 +- components/bt/bluedroid/stack/include/btm_api.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/components/bt/bluedroid/btif/bta_dm_co.c b/components/bt/bluedroid/btif/bta_dm_co.c index 38002fae07..291db9e3dd 100644 --- a/components/bt/bluedroid/btif/bta_dm_co.c +++ b/components/bt/bluedroid/btif/bta_dm_co.c @@ -502,7 +502,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) { #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; } else { APPL_TRACE_ERROR("%s error:Invalid key size value, key_size =%d",__func__, ble_key_size); diff --git a/components/bt/bluedroid/stack/include/btm_api.h b/components/bt/bluedroid/stack/include/btm_api.h index 4af3a48635..d4ee7b4734 100644 --- a/components/bt/bluedroid/stack/include/btm_api.h +++ b/components/bt/bluedroid/stack/include/btm_api.h @@ -1416,6 +1416,7 @@ typedef UINT8 tBTM_IO_CAP; #define BTM_BLE_INITIATOR_KEY_SIZE 15 #define BTM_BLE_RESPONDER_KEY_SIZE 15 #define BTM_BLE_MAX_KEY_SIZE 16 +#define BTM_BLE_MIN_KEY_SIZE 7 typedef UINT8 tBTM_AUTH_REQ; From c5ea00c727a9f53864ca3321cd643275b9ecd174 Mon Sep 17 00:00:00 2001 From: Yulong Date: Fri, 18 Aug 2017 03:48:57 -0400 Subject: [PATCH 3/3] component/bt: Change the debug info. --- components/bt/bluedroid/btif/bta_dm_co.c | 1 - 1 file changed, 1 deletion(-) diff --git a/components/bt/bluedroid/btif/bta_dm_co.c b/components/bt/bluedroid/btif/bta_dm_co.c index 291db9e3dd..af888b5b0e 100644 --- a/components/bt/bluedroid/btif/bta_dm_co.c +++ b/components/bt/bluedroid/btif/bta_dm_co.c @@ -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 #if (SMP_INCLUDED == TRUE) 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 }