tests: bluetooth: mesh: remove tinycrypt support from bsim mesh

Commit removes Tinycrypt support from bsim mesh tests
as well as optimizes test suite number and features.

Several tests were added only for Tinycrypt library
and were never run with PSA Crypto. Especially these
are tests related to advertiser or suspending functionality.
Mesh has two advertiser implementations.
Some legacy advertiser functionality was NEVER run in
combination with PSA. Furthermore, the low latency feature of
the legacy advertiser has been added a long time ago
to suitable test suites like transport and friendship
data transmission. Later when another tests were added
those required legacy advertiser checking the low latency
overlay has been used instead of adding pure legacy advertiser.
That caused a situation where actually the low latency
advertiser has never been tested without the low latency feature.
And even worse case, we started adapting the mesh tests
to the low latency feature.

These 2 maintenance mistakes:

Running some tests only with Tinycrypt
Using the legacy advertiser always wtih the low latency feature
caused the situation where it started multiplying misbehavior.
Some tests became fully not functional after removing Tinycrypt library.

I'm talking about these two:
gatt_suspend_resume.sh
gatt_suspend_disable_resume.sh

The legacy advertiser does not send data after switching
from gatt to adv with low latency feature.

The low latency overlay was changed to the legacy overlay
everywhere where the low latency feature is not tested.
If we want to test behavior of the legacy advertiser,
then the only legacy advertiser should be added. Nothing more.

Signed-off-by: Aleksandr Khromykh <[email protected]>

Author: alxelax

tests/bsim/bluetooth/mesh/compile.sh

@@ -15,21 +15,15 @@ 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_legacy.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_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_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_gatt.conf;overlay_legacy.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_legacy.conf

@@ -0,0 +1 @@
+CONFIG_BT_EXT_ADV=n

tests/bsim/bluetooth/mesh/overlay_psa.conf

@@ -4,6 +4,8 @@ CONFIG_FLASH=y
 CONFIG_FLASH_MAP=y
 CONFIG_NVS=y
 
+CONFIG_SECURE_STORAGE=y
+
 CONFIG_BT_PERIPHERAL=y
 CONFIG_BT_MESH_GATT_PROXY=y
 CONFIG_BT_MESH_PB_GATT=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

@@ -194,14 +194,9 @@ extern const struct bt_mesh_comp comp;
  * with a 100ms interval.
  */
 static struct bt_mesh_test_gatt gatt_param = {
-#if defined(CONFIG_BT_EXT_ADV)
 	/* (total transmit duration) / (transmit interval) */
 	.transmits = 1500 / 100,
 	.interval = 100,
-#else
-	.transmits = 2000 / 1000,
-	.interval = 1000,
-#endif
 	.service = MESH_SERVICE_PROVISIONING,
 };
 

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

@@ -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_suspend.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