fixes

esphome/components/esp32_ble/__init__.py

@@ -21,6 +21,7 @@ from esphome.const import (
 )
 from esphome.core import CORE, CoroPriority, TimePeriod, coroutine_with_priority
 import esphome.final_validate as fv
+from esphome.types import ConfigType
 
 DEPENDENCIES = ["esp32"]
 CODEOWNERS = ["@jesserockz", "@Rapsssito", "@bdraco"]
@@ -298,6 +299,23 @@ CONFIG_SCHEMA = cv.Schema(
 ).extend(cv.COMPONENT_SCHEMA)
 
 
+def _validate_key_sizes(config: ConfigType) -> ConfigType:
+    if (
+        CONF_MIN_KEY_SIZE in config
+        and CONF_MAX_KEY_SIZE in config
+        and config[CONF_MIN_KEY_SIZE] > config[CONF_MAX_KEY_SIZE]
+    ):
+        raise cv.Invalid(
+            f"min_key_size ({config[CONF_MIN_KEY_SIZE]}) must be "
+            f"less than or equal to "
+            f"max_key_size ({config[CONF_MAX_KEY_SIZE]})"
+        )
+    return config
+
+
+CONFIG_SCHEMA = cv.All(CONFIG_SCHEMA, _validate_key_sizes)
+
+
 bt_uuid16_format = "XXXX"
 bt_uuid32_format = "XXXXXXXX"
 bt_uuid128_format = "XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX"

esphome/components/esp32_ble/ble.cpp

@@ -717,7 +717,7 @@ void ESP32BLE::dump_config() {
       ESP_LOGCONFIG(TAG, "  Key Size: %u - %u", this->min_key_size_, this->max_key_size_);
     } else if (this->max_key_size_) {
       ESP_LOGCONFIG(TAG, "  Key Size: <default> - %u", this->max_key_size_);
-    } else if (this->max_key_size_) {
+    } else if (this->min_key_size_) {
       ESP_LOGCONFIG(TAG, "  Key Size: %u - <default>", this->min_key_size_);
     }
 #endif  // ESPHOME_ESP32_BLE_EXTENDED_AUTH_PARAMS

esphome/components/esp32_ble/ble.h

@@ -52,6 +52,7 @@ enum IoCapability {
   IO_CAP_KBDISP = ESP_IO_CAP_KBDISP,
 };
 
+#ifdef ESPHOME_ESP32_BLE_EXTENDED_AUTH_PARAMS
 enum AuthReqMode {
   AUTH_REQ_NO_BOND = ESP_LE_AUTH_NO_BOND,
   AUTH_REQ_BOND = ESP_LE_AUTH_BOND,
@@ -62,6 +63,7 @@ enum AuthReqMode {
   AUTH_REQ_SC_MITM = ESP_LE_AUTH_REQ_SC_MITM,
   AUTH_REQ_SC_MITM_BOND = ESP_LE_AUTH_REQ_SC_MITM_BOND,
 };
+#endif
 
 enum BLEComponentState : uint8_t {
   /** Nothing has been initialized yet. */

esphome/core/defines.h

@@ -209,6 +209,7 @@
 #define ESPHOME_ESP32_BLE_GATTC_EVENT_HANDLER_COUNT 1
 #define ESPHOME_ESP32_BLE_GATTS_EVENT_HANDLER_COUNT 1
 #define ESPHOME_ESP32_BLE_BLE_STATUS_EVENT_HANDLER_COUNT 2
+#define ESPHOME_ESP32_BLE_EXTENDED_AUTH_PARAMS
 #define ESPHOME_LOOP_TASK_STACK_SIZE 8192
 #define USE_ESP32_CAMERA_JPEG_ENCODER
 #define USE_HTTP_REQUEST_RESPONSE

tests/components/esp32_ble_client/test-extended-auth-req-params-single.esp32-idf.yaml

@@ -1,6 +0,0 @@
-esp32_ble:
-  io_capability: keyboard_display
-  # Explicitly not setting some parameters to test ifdef selection
-  # max_key_size: 16
-  # min_key_size: 7
-  auth_req_mode: sc_mitm_bond

tests/components/esp32_ble_client/test-extended-auth-req-params.esp32-idf.yaml

@@ -1,5 +0,0 @@
-esp32_ble:
-  io_capability: keyboard_display
-  max_key_size: 16
-  min_key_size: 7
-  auth_req_mode: sc_mitm_bond