Merge branch 'nimble/workaound_ble_conn_err_v4.3' into 'release/v4.3'

NimBLE: Add NimBLE host support to reattempt GAP connection and address MITM vulnerability (CVE-2020-26558) (release/v4.3)

See merge request espressif/esp-idf!13549

components/bt/host/nimble/Kconfig.in

@@ -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

components/bt/host/nimble/nimble

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