From 8887bd5f3cafeb005c24cbf03b5bebecc6262a6b Mon Sep 17 00:00:00 2001 From: lly Date: Mon, 8 Jun 2020 17:23:17 +0800 Subject: [PATCH] ble_mesh: Update CMake and make files for tinycrypt --- components/bt/CMakeLists.txt | 16 ++++++++++++++++ components/bt/component.mk | 2 ++ 2 files changed, 18 insertions(+) diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt index b5d4bd154..1adeca4c8 100644 --- a/components/bt/CMakeLists.txt +++ b/components/bt/CMakeLists.txt @@ -293,6 +293,7 @@ if(CONFIG_BT_ENABLED) if(CONFIG_BLE_MESH) list(APPEND COMPONENT_ADD_INCLUDEDIRS "esp_ble_mesh/mesh_common/include" + "esp_ble_mesh/mesh_common/tinycrypt/include" "esp_ble_mesh/mesh_core" "esp_ble_mesh/mesh_core/include" "esp_ble_mesh/mesh_core/storage" @@ -325,6 +326,21 @@ if(CONFIG_BT_ENABLED) "esp_ble_mesh/btc/btc_ble_mesh_prov.c" "esp_ble_mesh/btc/btc_ble_mesh_sensor_model.c" "esp_ble_mesh/btc/btc_ble_mesh_time_scene_model.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/aes_decrypt.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/aes_encrypt.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/cbc_mode.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/ccm_mode.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/cmac_mode.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/ctr_mode.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/ctr_prng.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/ecc_dh.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/ecc_dsa.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/ecc_platform_specific.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/ecc.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/hmac_prng.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/hmac.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/sha256.c" + "esp_ble_mesh/mesh_common/tinycrypt/src/utils.c" "esp_ble_mesh/mesh_common/mesh_aes_encrypt.c" "esp_ble_mesh/mesh_common/mesh_atomic.c" "esp_ble_mesh/mesh_common/mesh_buf.c" diff --git a/components/bt/component.mk b/components/bt/component.mk index 04061b160..86bc73574 100644 --- a/components/bt/component.mk +++ b/components/bt/component.mk @@ -139,6 +139,7 @@ endif ifdef CONFIG_BLE_MESH COMPONENT_ADD_INCLUDEDIRS += esp_ble_mesh/mesh_common/include \ + esp_ble_mesh/mesh_common/tinycrypt/include \ esp_ble_mesh/mesh_core \ esp_ble_mesh/mesh_core/include \ esp_ble_mesh/mesh_core/storage \ @@ -151,6 +152,7 @@ COMPONENT_ADD_INCLUDEDIRS += esp_ble_mesh/mesh_common/include \ esp_ble_mesh/api COMPONENT_SRCDIRS += esp_ble_mesh/mesh_common \ + esp_ble_mesh/mesh_common/tinycrypt \ esp_ble_mesh/mesh_core \ esp_ble_mesh/mesh_core/storage \ esp_ble_mesh/btc \