tests: bsim: bluetooth: mesh: Remove bsim tests with TinyCrypt

As TinyCrypt gets deprecated, we need to remove all bsim tests that use
it. This commit switches all Bluetooth mesh bsim tests to PSA as a
default crypto backend.

This includes:
- removing `CONFIG_BT_MESH_USES_TINYCRYPT` as PSA is default crypto
  backend for mesh. `CONFIG_BT_MESH_USES_MBEDTLS_PSA` is not required to
  be enabled;
- merging `overlay_psa.conf` into `prj.conf` as this configuration
  becomes default for all mesh bsim tests;
- merging `overlay_ss.conf` into `overlay_pst.conf` as secure storage is
  required for running persistent storage bsim tests with PSA;

Signed-off-by: Pavel Vasilyev <[email protected]>

Author: PavelVPV

tests/bsim/bluetooth/mesh/compile.sh

@@ -15,24 +15,14 @@ app=tests/bsim/bluetooth/mesh conf_overlay=overlay_pst.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_gatt.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_gatt_separate.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_low_lat.conf compile
-app=tests/bsim/bluetooth/mesh conf_overlay=overlay_psa.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_workq_sys.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_multi_adv_sets.conf compile
 app=tests/bsim/bluetooth/mesh conf_overlay=overlay_lpn_scan_on.conf compile
-app=tests/bsim/bluetooth/mesh \
-  conf_overlay="overlay_pst.conf;overlay_ss.conf;overlay_psa.conf" compile
-app=tests/bsim/bluetooth/mesh conf_overlay="overlay_psa.conf;overlay_low_lat.conf" compile
-app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_psa.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_workq_sys.conf" compile
-app=tests/bsim/bluetooth/mesh \
-  conf_overlay="overlay_gatt.conf;overlay_psa.conf;overlay_low_lat.conf" compile
-app=tests/bsim/bluetooth/mesh conf_overlay="overlay_low_lat.conf;overlay_psa.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_gatt.conf;overlay_low_lat.conf" compile
 app=tests/bsim/bluetooth/mesh conf_overlay="overlay_pst.conf;overlay_gatt.conf" compile
 app=tests/bsim/bluetooth/mesh \
   conf_overlay="overlay_gatt.conf;overlay_multi_adv_sets.conf" compile
-app=tests/bsim/bluetooth/mesh \
-  conf_overlay="overlay_pst.conf;overlay_ss.conf;overlay_gatt.conf;overlay_psa.conf" compile
 app=tests/bsim/bluetooth/mesh \
   conf_overlay="overlay_pst.conf;overlay_gatt.conf;overlay_workq_sys.conf" compile
 wait_for_background_jobs

tests/bsim/bluetooth/mesh/overlay_psa.conf

@@ -15,3 +15,6 @@ CONFIG_BT_MESH_SEQ_STORE_RATE=1
 CONFIG_BT_MESH_RPL_STORE_TIMEOUT=1
 CONFIG_BT_MESH_STORE_TIMEOUT=1
 CONFIG_BT_MESH_COMP_PST_BUF_SIZE=600
+
+# Required for PSA
+CONFIG_SECURE_STORAGE=y

tests/bsim/bluetooth/mesh/overlay_pst.conf

@@ -74,5 +74,5 @@ CONFIG_BT_TESTING=y
 # Needed for RPR tests due to huge amount of retransmitted messages
 CONFIG_BT_MESH_MSG_CACHE_SIZE=64
 
-# Enable tinycrypt as a crypto backend
-CONFIG_BT_MESH_USES_TINYCRYPT=y
+# Increase the number of key slots in PSA Crypto core
+CONFIG_MBEDTLS_PSA_KEY_SLOT_COUNT=64

tests/bsim/bluetooth/mesh/overlay_ss.conf

@@ -13,15 +13,7 @@
 #include <bs_pc_backchannel.h>
 #include <time_machine.h>
 
-#if defined CONFIG_BT_MESH_USES_MBEDTLS_PSA
 #include <psa/crypto.h>
-#elif defined CONFIG_BT_MESH_USES_TINYCRYPT
-#include <tinycrypt/constants.h>
-#include <tinycrypt/ecc.h>
-#include <tinycrypt/ecc_dh.h>
-#else
-#error "Unknown crypto library has been chosen"
-#endif
 
 #include <zephyr/sys/byteorder.h>
 
@@ -527,7 +519,6 @@ static void oob_auth_set(int test_step)
 	prov.input_actions = oob_auth_test_vector[test_step].input_actions;
 }
 
-#if defined CONFIG_BT_MESH_USES_MBEDTLS_PSA
 static void generate_oob_key_pair(void)
 {
 	psa_key_attributes_t key_attributes = PSA_KEY_ATTRIBUTES_INIT;
@@ -562,12 +553,6 @@ static void generate_oob_key_pair(void)
 
 	memcpy(public_key_be, public_key_repr + 1, 64);
 }
-#elif defined CONFIG_BT_MESH_USES_TINYCRYPT
-static void generate_oob_key_pair(void)
-{
-	ASSERT_TRUE(uECC_make_key(public_key_be, private_key_be, uECC_secp256r1()));
-}
-#endif
 
 static void oob_device(bool use_oob_pk)
 {

tests/bsim/bluetooth/mesh/prj.conf

@@ -6,7 +6,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 
 RunTest mesh_access_publication_cancel \
 	access_tx_cancel access_rx_cancel
-
-overlay=overlay_psa_conf
-RunTest mesh_access_publication_cancel_psa \
-	access_tx_cancel access_rx_cancel

tests/bsim/bluetooth/mesh/src/test_provision.c

@@ -6,7 +6,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 
 RunTest mesh_access_extended_model_subs \
 	access_tx_ext_model access_sub_ext_model
-
-overlay=overlay_psa_conf
-RunTest mesh_access_extended_model_subs_psa \
-	access_tx_ext_model access_sub_ext_model

tests/bsim/bluetooth/mesh/tests_scripts/access/access_cancel.sh

@@ -5,6 +5,3 @@
 source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 
 RunTest mesh_access_extended_model_subs_cap access_sub_capacity_ext_model
-
-overlay=overlay_psa_conf
-RunTest mesh_access_extended_model_subs_cap_psa access_sub_capacity_ext_model

tests/bsim/bluetooth/mesh/tests_scripts/access/access_ext_sub.sh

@@ -6,7 +6,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 
 RunTest mesh_access_per_pub \
 	access_tx_period access_rx_period
-
-overlay=overlay_psa_conf
-RunTest mesh_access_per_pub_psa \
-	access_tx_period access_rx_period