diff --git a/doc/releases/migration-guide-4.3.rst b/doc/releases/migration-guide-4.3.rst index 83dc5e77120..18beaeec600 100644 --- a/doc/releases/migration-guide-4.3.rst +++ b/doc/releases/migration-guide-4.3.rst @@ -123,6 +123,13 @@ Bluetooth HCI * The deprecated ``ipm`` value was removed from ``bt-hci-bus`` devicetree property. ``ipc`` should be used instead. +Bluetooth Mesh +============== + +* Kconfigs ``CONFIG_BT_MESH_USES_MBEDTLS_PSA`` and ``CONFIG_BT_MESH_USES_TFM_PSA`` have + been removed. The selection of the PSA Crypto provider is now automatically controlled + by Kconfig :kconfig:option:`CONFIG_PSA_CRYPTO`. + Ethernet ======== diff --git a/subsys/bluetooth/mesh/Kconfig b/subsys/bluetooth/mesh/Kconfig index 297da4e8020..f71e6588bc9 100644 --- a/subsys/bluetooth/mesh/Kconfig +++ b/subsys/bluetooth/mesh/Kconfig @@ -1507,17 +1507,10 @@ config BT_MESH_SECURE_STORAGE bool depends on SECURE_STORAGE -choice BT_MESH_CRYPTO_LIB - prompt "Crypto library:" - default BT_MESH_USES_TFM_PSA if BUILD_WITH_TFM - default BT_MESH_USES_MBEDTLS_PSA - help - Crypto library selection for mesh security. - -config BT_MESH_USES_MBEDTLS_PSA - bool "mbed TLS PSA" - select MBEDTLS - select MBEDTLS_PSA_CRYPTO_C +config BT_MESH_CRYPTO_LIB + bool + default y + select PSA_CRYPTO select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_IMPORT select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_EXPORT select PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_GENERATE @@ -1532,18 +1525,9 @@ config BT_MESH_USES_MBEDTLS_PSA select PSA_WANT_ALG_ECDH select PSA_WANT_ECC_SECP_R1_256 select BT_MESH_SECURE_STORAGE if BT_SETTINGS - imply MBEDTLS_AES_ROM_TABLES + imply MBEDTLS_AES_ROM_TABLES if PSA_CRYPTO_PROVIDER_MBEDTLS help - Use Mbed TLS as PSA Crypto API provider. - -config BT_MESH_USES_TFM_PSA - bool "TF-M PSA" - depends on BUILD_WITH_TFM - help - Use TF-M as PSA Crypto API provider. This is only possible on platforms - that support TF-M. - -endchoice + Crypto library support for mesh security. menu "Beacons" diff --git a/tests/bluetooth/mesh/brg/CMakeLists.txt b/tests/bluetooth/mesh/brg/CMakeLists.txt index 55e77eaef75..e6b6a7d531b 100644 --- a/tests/bluetooth/mesh/brg/CMakeLists.txt +++ b/tests/bluetooth/mesh/brg/CMakeLists.txt @@ -20,4 +20,4 @@ target_compile_options(app -DCONFIG_BT_SETTINGS -DCONFIG_BT_MESH_BRG_CFG_SRV -DCONFIG_BT_MESH_BRG_TABLE_ITEMS_MAX=16 - -DCONFIG_BT_MESH_USES_MBEDTLS_PSA) + -DCONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS) diff --git a/tests/bluetooth/mesh/delayable_msg/CMakeLists.txt b/tests/bluetooth/mesh/delayable_msg/CMakeLists.txt index 96af1f0175c..f2148e05347 100644 --- a/tests/bluetooth/mesh/delayable_msg/CMakeLists.txt +++ b/tests/bluetooth/mesh/delayable_msg/CMakeLists.txt @@ -21,4 +21,4 @@ target_compile_options(app -DCONFIG_BT_MESH_ACCESS_DELAYABLE_MSG_COUNT=4 -DCONFIG_BT_MESH_ACCESS_DELAYABLE_MSG_CHUNK_SIZE=20 -DCONFIG_BT_MESH_ACCESS_DELAYABLE_MSG_CHUNK_COUNT=20 - -DCONFIG_BT_MESH_USES_MBEDTLS_PSA) + -DCONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS) diff --git a/tests/bluetooth/mesh/rpl/CMakeLists.txt b/tests/bluetooth/mesh/rpl/CMakeLists.txt index 44bb865291a..8a90762d70d 100644 --- a/tests/bluetooth/mesh/rpl/CMakeLists.txt +++ b/tests/bluetooth/mesh/rpl/CMakeLists.txt @@ -20,4 +20,4 @@ target_compile_options(app -DCONFIG_BT_MESH_CRPL=10 -DCONFIG_BT_MESH_RPL_STORE_TIMEOUT=1 -DCONFIG_BT_SETTINGS - -DCONFIG_BT_MESH_USES_MBEDTLS_PSA) + -DCONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS) diff --git a/tests/bsim/bluetooth/mesh/src/mesh_test.c b/tests/bsim/bluetooth/mesh/src/mesh_test.c index 255f8d8aa43..658aa48133b 100644 --- a/tests/bsim/bluetooth/mesh/src/mesh_test.c +++ b/tests/bsim/bluetooth/mesh/src/mesh_test.c @@ -292,7 +292,7 @@ void bt_mesh_device_setup(const struct bt_mesh_prov *prov, const struct bt_mesh_ if (IS_ENABLED(CONFIG_BT_SETTINGS)) { LOG_INF("Loading stored settings"); - if (IS_ENABLED(CONFIG_BT_MESH_USES_MBEDTLS_PSA)) { + if (IS_ENABLED(CONFIG_PSA_CRYPTO_PROVIDER_MBEDTLS)) { settings_load_subtree("itsemul"); } settings_load_subtree("bt");