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

Merge branch 'bugfix/btdm_revert_changes_of_security_mask_v3.2' into 'release/v3.2'

Browse source 
components/bt: Revert changes of security mask

See merge request espressif/esp-idf!7122
This commit is contained in:
Jiang Jiang Jian 2019-12-29 14:12:58 +08:00
commit 6916052e6d
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
components/bt/bluedroid/api/esp_spp_api.c
View file

@ -95,8 +95,8 @@ esp_err_t esp_spp_connect(esp_spp_sec_t sec_mask,
btc_spp_args_t arg; btc_spp_args_t arg;
ESP_BLUEDROID_STATUS_CHECK(ESP_BLUEDROID_STATUS_ENABLED); ESP_BLUEDROID_STATUS_CHECK(ESP_BLUEDROID_STATUS_ENABLED);
if (sec_mask != ESP_SPP_SEC_AUTHORIZE) { if (sec_mask != ESP_SPP_SEC_NONE && sec_mask != ESP_SPP_SEC_AUTHORIZE && sec_mask != ESP_SPP_SEC_AUTHENTICATE) {
LOG_WARN("Only ESP_SPP_SEC_AUTHORIZE is supported!\n"); LOG_WARN("Suggest to use ESP_SPP_SEC_NONE, ESP_SPP_SEC_AUTHORIZE or ESP_SPP_SEC_AUTHENTICATE only\n");
} }
msg.sig = BTC_SIG_API_CALL; msg.sig = BTC_SIG_API_CALL;
@ -137,8 +137,8 @@ esp_err_t esp_spp_start_srv(esp_spp_sec_t sec_mask,
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }
if (sec_mask != ESP_SPP_SEC_AUTHORIZE) { if (sec_mask != ESP_SPP_SEC_NONE && sec_mask != ESP_SPP_SEC_AUTHORIZE && sec_mask != ESP_SPP_SEC_AUTHENTICATE) {
LOG_WARN("Only ESP_SPP_SEC_AUTHORIZE is supported!\n"); LOG_WARN("Suggest to use ESP_SPP_SEC_NONE, ESP_SPP_SEC_AUTHORIZE or ESP_SPP_SEC_AUTHENTICATE only\n");
} }
msg.sig = BTC_SIG_API_CALL; msg.sig = BTC_SIG_API_CALL;

6
components/bt/bluedroid/api/include/api/esp_spp_api.h
View file

@ -30,7 +30,7 @@ typedef enum {
ESP_SPP_NO_RESOURCE /*!< No more set pm control block */ ESP_SPP_NO_RESOURCE /*!< No more set pm control block */
} esp_spp_status_t; } esp_spp_status_t;
/* Security Setting Mask, Only support ESP_SPP_SEC_AUTHORIZE.*/ /* Security Setting Mask, Suggest to use ESP_SPP_SEC_NONE, ESP_SPP_SEC_AUTHORIZE or ESP_SPP_SEC_AUTHENTICATE only.*/
#define ESP_SPP_SEC_NONE 0x0000 /*!< No security. relate to BTA_SEC_NONE in bta/bta_api.h */ #define ESP_SPP_SEC_NONE 0x0000 /*!< No security. relate to BTA_SEC_NONE in bta/bta_api.h */
#define ESP_SPP_SEC_AUTHORIZE 0x0001 /*!< Authorization required (only needed for out going connection ) relate to BTA_SEC_AUTHORIZE in bta/bta_api.h*/ #define ESP_SPP_SEC_AUTHORIZE 0x0001 /*!< Authorization required (only needed for out going connection ) relate to BTA_SEC_AUTHORIZE in bta/bta_api.h*/
#define ESP_SPP_SEC_AUTHENTICATE 0x0012 /*!< Authentication required. relate to BTA_SEC_AUTHENTICATE in bta/bta_api.h*/ #define ESP_SPP_SEC_AUTHENTICATE 0x0012 /*!< Authentication required. relate to BTA_SEC_AUTHENTICATE in bta/bta_api.h*/
@ -229,7 +229,7 @@ esp_err_t esp_spp_start_discovery(esp_bd_addr_t bd_addr);
* When the connection is established or failed, * When the connection is established or failed,
* the callback is called with ESP_SPP_OPEN_EVT. * the callback is called with ESP_SPP_OPEN_EVT.
* *
* @param[in] sec_mask: Security Setting Mask. Only support ESP_SPP_SEC_AUTHORIZE. * @param[in] sec_mask: Security Setting Mask. Suggest to use ESP_SPP_SEC_NONE, ESP_SPP_SEC_AUTHORIZE or ESP_SPP_SEC_AUTHENTICATE only.
* @param[in] role: Master or slave. * @param[in] role: Master or slave.
* @param[in] remote_scn: Remote device bluetooth device SCN. * @param[in] remote_scn: Remote device bluetooth device SCN.
* @param[in] peer_bd_addr: Remote device bluetooth device address. * @param[in] peer_bd_addr: Remote device bluetooth device address.
@ -260,7 +260,7 @@ esp_err_t esp_spp_disconnect(uint32_t handle);
* When the connection is established, the callback is called * When the connection is established, the callback is called
* with ESP_SPP_SRV_OPEN_EVT. * with ESP_SPP_SRV_OPEN_EVT.
* *
* @param[in] sec_mask: Security Setting Mask. Only support ESP_SPP_SEC_AUTHORIZE. * @param[in] sec_mask: Security Setting Mask. Security Setting Mask. Suggest to use ESP_SPP_SEC_NONE, ESP_SPP_SEC_AUTHORIZE or ESP_SPP_SEC_AUTHENTICATE only.
* @param[in] role: Master or slave. * @param[in] role: Master or slave.
* @param[in] local_scn: The specific channel you want to get. * @param[in] local_scn: The specific channel you want to get.
* If channel is 0, means get any channel. * If channel is 0, means get any channel.