Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/ble_mesh_unify_crypto_v6.0' into 'release/v6.0'

Browse Source 
Feat/ble mesh unify crypto v6.0

See merge request espressif/esp-idf!44818
This commit is contained in:
Island
2026-01-07 19:47:38 +08:00
parent 8eec3ef885 3f7494bbf9
commit 35ff0c786d
20 changed files with 2212 additions and 946 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/CMakeLists.txt
+16 -3
View File
@@ -556,8 +556,21 @@ if(CONFIG_BT_ENABLED)
"esp_ble_mesh/common/mutex.c"
"esp_ble_mesh/common/queue.c"
"esp_ble_mesh/common/timer.c"
"esp_ble_mesh/common/utils.c"
"esp_ble_mesh/core/storage/settings_nvs.c"
"esp_ble_mesh/common/utils.c")
# Select crypto implementation based on config
if(CONFIG_BT_SMP_CRYPTO_STACK_TINYCRYPT OR
CONFIG_BT_SMP_CRYPTO_STACK_NATIVE)
list(APPEND srcs "esp_ble_mesh/common/crypto_tc.c")
elseif(CONFIG_BT_SMP_CRYPTO_STACK_MBEDTLS)
if(CONFIG_MBEDTLS_VER_4_X_SUPPORT)
list(APPEND srcs "esp_ble_mesh/common/crypto_psa.c")
else()
list(APPEND srcs "esp_ble_mesh/common/crypto_mbedtls.c")
endif()
endif()
list(APPEND srcs "esp_ble_mesh/core/storage/settings_nvs.c"
"esp_ble_mesh/core/storage/settings_uid.c"
"esp_ble_mesh/core/storage/settings.c"
"esp_ble_mesh/core/access.c"
@@ -599,7 +612,7 @@ if(CONFIG_BT_ENABLED)
"esp_ble_mesh/models/server/state_transition.c"
"esp_ble_mesh/models/server/time_scene_server.c")
if(NOT CONFIG_BLE_MESH_USE_UNIFIED_CRYPTO)
if(CONFIG_BT_SMP_CRYPTO_STACK_NATIVE)
list(APPEND include_dirs ${ble_mesh_tinycrypt_dirs})
list(APPEND srcs
"esp_ble_mesh/common/tinycrypt/src/aes_decrypt.c"