Merge pull request #40 from seagull9000/fix/esp32-ble-enc-funcs-reset

fix(esp32): init controller encryption so LE Secure Connections pairing works

zephcore/CMakeLists.txt

@@ -170,6 +170,16 @@ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/patches/modules/loramac-node)
     )
 endif()
 
+# Apply patches to hal_espressif module (ESP32 BLE controller glue)
+if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/patches/modules/hal-espressif)
+    message(STATUS "Applying ZephCore patches to hal_espressif...")
+    zephcore_apply_patches(
+        "${CMAKE_CURRENT_SOURCE_DIR}/patches/modules/hal-espressif"
+        "${MODULES_DIR}/hal/espressif"
+        "hal-espressif"
+    )
+endif()
+
 # Copy new files into Zephyr tree
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/patches/zephyr-new)
     file(GLOB_RECURSE ZEPHCORE_NEW_FILES

zephcore/patches/modules/hal-espressif/0001-ble-enc-funcs-reset.patch

@@ -0,0 +1,22 @@
+diff --git a/components/bt/controller/esp32c3/bt.c b/components/bt/controller/esp32c3/bt.c
+index 7f47e23f4e..ab872f5654 100644
+--- a/components/bt/controller/esp32c3/bt.c
++++ b/components/bt/controller/esp32c3/bt.c
+@@ -1415,9 +1415,15 @@ static void btdm_funcs_table_ready_wrapper(void)
+     ble_cca_funcs_reset();
+ #endif // (BT_BLE_CCA_MODE != 0)
+ 
+-#if CONFIG_BT_CTRL_BLE_SECURITY_ENABLE
++/* ZephCore patch: guard was CONFIG_BT_CTRL_BLE_SECURITY_ENABLE (an IDF sdkconfig
++ * symbol never defined in Zephyr builds), so ble_enc_funcs_reset() was never
++ * called -> the controller's LE Secure Connections encryption table stayed
++ * uninitialised -> SC pairing produced a wrong session key -> 0x3D MIC failure
++ * (e.g. Pixel 7). BLE_SECURITY_ENABLE maps to CONFIG_ESP32_BT_CTLR_LE_SECURITY_ENABLE
++ * (the Zephyr knob, =y) and is already used for .enc_en in esp_bt.h. */
++#if BLE_SECURITY_ENABLE
+     ble_enc_funcs_reset();
+-#endif // CONFIG_BT_CTRL_BLE_SECURITY_ENABLE
++#endif // BLE_SECURITY_ENABLE
+ 
+ #if CONFIG_BT_CTRL_BLE_MASTER
+     ble_init_funcs_reset();