[nrf noup] Revert "[nrf fromtree] bluetooth: mesh: use new Kconfig CONFIG_PSA_CRYPTO"

This reverts commit 179f7f9.

Signed-off-by: alperen sener <[email protected]>

Author: m-alperen-sener

doc/releases/migration-guide-4.3.rst

@@ -123,13 +123,6 @@ 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`.
-
 Bluetooth Host
 ==============
 

subsys/bluetooth/mesh/Kconfig

@@ -1507,10 +1507,17 @@ config BT_MESH_SECURE_STORAGE
 	bool
 	depends on SECURE_STORAGE
 
-config BT_MESH_CRYPTO_LIB
-	bool
-	default y
-	select PSA_CRYPTO
+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
 	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
@@ -1525,9 +1532,18 @@ config BT_MESH_CRYPTO_LIB
 	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 if PSA_CRYPTO_PROVIDER_MBEDTLS
+	imply MBEDTLS_AES_ROM_TABLES
 	help
-	  Crypto library support for mesh security.
+	  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
 
 menu "Beacons"
 

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_PSA_CRYPTO_PROVIDER_MBEDTLS)
+	-DCONFIG_BT_MESH_USES_MBEDTLS_PSA)

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_PSA_CRYPTO_PROVIDER_MBEDTLS)
+	-DCONFIG_BT_MESH_USES_MBEDTLS_PSA)

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_PSA_CRYPTO_PROVIDER_MBEDTLS)
+	-DCONFIG_BT_MESH_USES_MBEDTLS_PSA)

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_PSA_CRYPTO_PROVIDER_MBEDTLS)) {
+		if (IS_ENABLED(CONFIG_BT_MESH_USES_MBEDTLS_PSA)) {
 			settings_load_subtree("itsemul");
 		}
 		settings_load_subtree("bt");