Merge branch 'nimble/workaound_ble_conn_err' into 'master'

NimBLE: Add NimBLE host support to reattempt GAP connection and address MITM vulnerability  (CVE-2020-26558)

See merge request espressif/esp-idf!13536
This commit is contained in:
Jiang Jiang Jian 2021-05-13 16:17:24 +00:00
commit 4d83492610
2 changed files with 17 additions and 1 deletions

View File

@ -435,6 +435,22 @@ config BT_NIMBLE_HOST_BASED_PRIVACY
Use this option to do host based Random Private Address resolution.
If this option is disabled then controller based privacy is used.
config BT_NIMBLE_ENABLE_CONN_REATTEMPT
bool "Enable connection reattempts on connection establishment error"
default y if (IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3)
default n if IDF_TARGET_ESP32
help
Enable to make the NimBLE host to reattempt GAP connection on connection
establishment failure.
config BT_NIMBLE_MAX_CONN_REATTEMPT
int "Maximum number connection reattempts"
range 1 7
default 3
depends on BT_NIMBLE_ENABLED && BT_NIMBLE_ENABLE_CONN_REATTEMPT
help
Defines maximum number of connection reattempts.
config BT_NIMBLE_EXT_ADV
bool "Enable extended advertising."
default n

@ -1 +1 @@
Subproject commit f04c92400a44ee16e6ee6c02e9247f6d3e213dda
Subproject commit 5bb7b402275210ed6f97fe4bd6e452bf0f659452