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.

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

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

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

@@ -6,7 +6,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 
 RunTest mesh_access_pub_period_delayable_retr \
 	access_tx_period_delayable access_rx_period_delayable
-
-overlay=overlay_psa_conf
-RunTest mesh_access_pub_period_delayable_retr_psa \
-	access_tx_period_delayable access_rx_period_delayable

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

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

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

@@ -6,7 +6,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 
 RunTest mesh_access_pub_transmit_delayable_retr \
 	access_tx_transmit_delayable access_rx_transmit_delayable
-
-overlay=overlay_psa_conf
-RunTest mesh_access_pub_transmit_delayable_retr_psa \
-	access_tx_transmit_delayable access_rx_transmit_delayable

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

@@ -34,8 +34,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_adv_disable adv_tx_disable adv_rx_disable
 
 # Low latency overlay uses legacy advertiser
-overlay=overlay_low_lat_conf
-RunTest mesh_adv_disable adv_tx_disable adv_rx_disable
+overlay=overlay_legacy_conf
+RunTest mesh_adv_disable_legacy adv_tx_disable adv_rx_disable
 
 overlay=overlay_workq_sys_conf
 RunTest mesh_adv_disable_workq adv_tx_disable adv_rx_disable

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

@@ -29,6 +29,3 @@ RunTest mesh_adv_proxy_mixin_workq adv_tx_proxy_mixin adv_rx_proxy_mixin
 
 overlay="overlay_gatt_conf_overlay_multi_adv_sets_conf"
 RunTest mesh_adv_proxy_mixin_multi_adv_sets adv_tx_proxy_mixin adv_rx_proxy_mixin
-
-overlay="overlay_gatt_conf_overlay_psa_conf"
-RunTest mesh_adv_proxy_mixin_psa adv_tx_proxy_mixin adv_rx_proxy_mixin

tests/bsim/bluetooth/mesh/tests_scripts/advertiser/disable.sh

@@ -12,6 +12,3 @@ RunTest mesh_adv_random_order_workq adv_tx_random_order adv_rx_random_order
 
 overlay="overlay_multi_adv_sets_conf"
 RunTest mesh_adv_random_order_multi_adv_sets adv_tx_random_order adv_rx_random_order
-
-overlay=overlay_psa_conf
-RunTest mesh_adv_random_order_psa adv_tx_random_order adv_rx_random_order

tests/bsim/bluetooth/mesh/tests_scripts/advertiser/proxy_mixin.sh

@@ -12,6 +12,3 @@ RunTest mesh_adv_reverse_order_workq adv_tx_reverse_order adv_rx_receive_order
 
 overlay="overlay_multi_adv_sets_conf"
 RunTest mesh_adv_reverse_order_multi_adv_sets adv_tx_reverse_order adv_rx_receive_order
-
-overlay=overlay_psa_conf
-RunTest mesh_adv_reverse_order_psa adv_tx_reverse_order adv_rx_receive_order

tests/bsim/bluetooth/mesh/tests_scripts/advertiser/random_order.sh

@@ -12,6 +12,3 @@ RunTest mesh_adv_send_order_workq adv_tx_send_order adv_rx_receive_order
 
 overlay="overlay_multi_adv_sets_conf"
 RunTest mesh_adv_send_order_multi_adv_sets adv_tx_send_order adv_rx_receive_order
-
-overlay=overlay_psa_conf
-RunTest mesh_adv_send_order_psa adv_tx_send_order adv_rx_receive_order

tests/bsim/bluetooth/mesh/tests_scripts/advertiser/reverse_order.sh

@@ -12,6 +12,3 @@ RunTest mesh_adv_tx_cb_multi_workq adv_tx_cb_multi
 
 overlay="overlay_multi_adv_sets_conf"
 RunTest mesh_adv_tx_cb_multi_multi_adv_sets adv_tx_cb_multi
-
-overlay=overlay_psa_conf
-RunTest mesh_adv_tx_cb_multi_psa adv_tx_cb_multi

tests/bsim/bluetooth/mesh/tests_scripts/advertiser/send_order.sh

@@ -11,7 +11,4 @@ overlay=overlay_workq_sys_conf
 RunTest mesh_adv_tx_cb_single_workq adv_tx_cb_single adv_rx_xmit
 
 overlay="overlay_multi_adv_sets_conf"
-RunTest mesh_adv_tx_cb_single_psa_multi_adv_sets adv_tx_cb_single adv_rx_xmit
-
-overlay=overlay_psa_conf
-RunTest mesh_adv_tx_cb_single_psa adv_tx_cb_single adv_rx_xmit
+RunTest mesh_adv_tx_cb_single_multi_adv_sets adv_tx_cb_single adv_rx_xmit

tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_multi.sh

@@ -14,8 +14,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_beacon_cache \
 	beacon_tx_beacon_cache \
 	beacon_rx_beacon_cache
-
-overlay=overlay_psa_conf
-RunTest mesh_beacon_cache \
-	beacon_tx_beacon_cache \
-	beacon_rx_beacon_cache

tests/bsim/bluetooth/mesh/tests_scripts/advertiser/tx_cb_single.sh

@@ -21,8 +21,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_beacon_interval \
 	beacon_tx_secure_beacon_interval \
 	beacon_rx_secure_beacon_interval
-
-overlay=overlay_psa_conf
-RunTest mesh_beacon_interval_psa \
-	beacon_tx_secure_beacon_interval \
-	beacon_rx_secure_beacon_interval

tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_cache.sh

@@ -7,8 +7,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_beacon_invalid \
 	beacon_tx_invalid \
 	beacon_rx_invalid
-
-overlay=overlay_psa_conf
-RunTest mesh_beacon_invalid_psa \
-	beacon_tx_invalid \
-	beacon_rx_invalid

tests/bsim/bluetooth/mesh/tests_scripts/beacon/beacon_interval.sh

@@ -7,8 +7,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_beacon_on_iv_update \
 	beacon_tx_on_iv_update \
 	beacon_rx_on_iv_update
-
-overlay=overlay_psa_conf
-RunTest mesh_beacon_on_iv_update_psa \
-	beacon_tx_on_iv_update \
-	beacon_rx_on_iv_update

tests/bsim/bluetooth/mesh/tests_scripts/beacon/invalid.sh

@@ -7,8 +7,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_beacon_on_key_refresh \
 	beacon_tx_on_key_refresh \
 	beacon_rx_on_key_refresh
-
-overlay=overlay_psa_conf
-RunTest mesh_beacon_on_key_refresh_psa \
-	beacon_tx_on_key_refresh \
-	beacon_rx_on_key_refresh

tests/bsim/bluetooth/mesh/tests_scripts/beacon/iv_update.sh

@@ -7,8 +7,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_beacon_kr_old_key \
 	beacon_tx_kr_old_key \
 	beacon_rx_kr_old_key
-
-overlay=overlay_psa_conf
-RunTest mesh_beacon_kr_old_key_psa \
-	beacon_tx_kr_old_key \
-	beacon_rx_kr_old_key

tests/bsim/bluetooth/mesh/tests_scripts/beacon/key_refresh.sh

@@ -7,8 +7,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest mesh_beacon_multiple_netkeys \
 	beacon_tx_multiple_netkeys \
 	beacon_rx_multiple_netkeys
-
-overlay=overlay_psa_conf
-RunTest mesh_beacon_multiple_netkeys_psa \
-	beacon_tx_multiple_netkeys \
-	beacon_rx_multiple_netkeys

tests/bsim/bluetooth/mesh/tests_scripts/beacon/kr_old_key.sh

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

tests/bsim/bluetooth/mesh/tests_scripts/beacon/multiple_netkeys.sh

@@ -7,7 +7,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # The test instance sequence must stay as it is due to addressing scheme
 RunTest blob_caps_all_rsp \
 	blob_cli_caps_all_rsp blob_srv_caps_standard blob_srv_caps_standard
-
-overlay=overlay_psa_conf
-RunTest blob_caps_all_rsp_psa \
-	blob_cli_caps_all_rsp blob_srv_caps_standard blob_srv_caps_standard

tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_broadcast_unicast.sh

@@ -7,7 +7,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # The test instance seqence must stay as it is due to addressing scheme
 RunTest blob_caps_cancelled \
 	blob_cli_caps_cancelled blob_srv_caps_standard
-
-overlay=overlay_psa_conf
-RunTest blob_caps_cancelled_psa \
-	blob_cli_caps_cancelled blob_srv_caps_standard

tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_all_rsp.sh

@@ -7,7 +7,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # The test instance sequence must stay as it is due to addressing scheme
 RunTest blob_caps_no_rsp \
 	blob_cli_caps_no_rsp blob_srv_caps_no_rsp blob_srv_caps_no_rsp
-
-overlay=overlay_psa_conf
-RunTest blob_caps_no_rsp_psa \
-	blob_cli_caps_no_rsp blob_srv_caps_no_rsp blob_srv_caps_no_rsp

tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_cancelled.sh

@@ -7,7 +7,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # The test instance sequence must stay as it is due to addressing scheme
 RunTest blob_caps_partial_rsp \
 	blob_cli_caps_partial_rsp blob_srv_caps_standard blob_srv_caps_no_rsp
-
-overlay=overlay_psa_conf
-RunTest blob_caps_partial_rsp_psa \
-	blob_cli_caps_partial_rsp blob_srv_caps_standard blob_srv_caps_no_rsp

tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_no_rsp.sh

@@ -14,12 +14,3 @@ RunTest blob_transfer_lpn \
 	blob_srv_lpn_pull \
 	blob_srv_lpn_pull \
 	blob_srv_lpn_pull
-
-overlay=overlay_psa_conf
-RunTest blob_transfer_lpn_psa \
-	blob_cli_friend_pull \
-	blob_srv_lpn_pull \
-	blob_srv_lpn_pull \
-	blob_srv_lpn_pull \
-	blob_srv_lpn_pull \
-	blob_srv_lpn_pull

tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_caps_partial_rsp.sh

@@ -8,9 +8,3 @@ RunTest blob_no_rsp_block_get \
 	blob_cli_fail_on_no_rsp \
 	blob_srv_fail_on_block_get \
 	blob_srv_fail_on_block_get -- -argstest msg-fail-type=0
-
-overlay=overlay_psa_conf
-RunTest blob_no_rsp_block_get_psa \
-	blob_cli_fail_on_no_rsp \
-	blob_srv_fail_on_block_get \
-	blob_srv_fail_on_block_get -- -argstest msg-fail-type=0

tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_friend.sh

@@ -8,9 +8,3 @@ RunTest blob_no_rsp_xfer_get \
 	blob_cli_fail_on_no_rsp \
 	blob_srv_fail_on_xfer_get \
 	blob_srv_fail_on_xfer_get -- -argstest msg-fail-type=1
-
-overlay=overlay_psa_conf
-RunTest blob_no_rsp_xfer_get_psa \
-	blob_cli_fail_on_no_rsp \
-	blob_srv_fail_on_xfer_get \
-	blob_srv_fail_on_xfer_get -- -argstest msg-fail-type=1

tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_block.sh

@@ -11,11 +11,3 @@ RunTest blob_fail \
 	blob_srv_fail_on_block_get \
 	blob_srv_fail_on_xfer_get \
 	blob_srv_fail_on_nothing
-
-overlay=overlay_psa_conf
-RunTest blob_fail_psa \
-	blob_cli_fail_on_persistency \
-	blob_srv_fail_on_block_start\
-	blob_srv_fail_on_block_get \
-	blob_srv_fail_on_xfer_get \
-	blob_srv_fail_on_nothing

tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_no_rsp_xfer.sh

@@ -9,9 +9,3 @@ RunTest blob_pst_pull \
 	blob_cli_trans_persistency_pull \
 	blob_srv_trans_persistency_pull \
 	blob_srv_trans_persistency_pull
-
-overlay=overlay_psa_conf
-RunTest blob_pst_pull_psa \
-	blob_cli_trans_persistency_pull \
-	blob_srv_trans_persistency_pull \
-	blob_srv_trans_persistency_pull

tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer.sh

@@ -9,9 +9,3 @@ RunTest blob_success_pull blob_cli_trans_complete \
 	blob_srv_trans_complete blob_srv_trans_complete \
 	blob_srv_trans_complete blob_srv_trans_complete \
 	-- -argstest use-pull-mode=1
-
-overlay=overlay_psa_conf
-RunTest blob_success_pull_psa blob_cli_trans_complete \
-	blob_srv_trans_complete blob_srv_trans_complete \
-	blob_srv_trans_complete blob_srv_trans_complete \
-	-- -argstest use-pull-mode=1

tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_persistent_transfer_pull.sh

@@ -8,8 +8,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 RunTest blob_success_push blob_cli_trans_complete \
 	blob_srv_trans_complete blob_srv_trans_complete \
 	blob_srv_trans_complete blob_srv_trans_complete
-
-overlay=overlay_psa_conf
-RunTest blob_success_push_psa blob_cli_trans_complete \
-	blob_srv_trans_complete blob_srv_trans_complete \
-	blob_srv_trans_complete blob_srv_trans_complete

tests/bsim/bluetooth/mesh/tests_scripts/blob_mdls/blob_cli_trans_complete_pull.sh

@@ -7,7 +7,3 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # Test that BLOB Client can resume a suspended BLOB Transfer in Pull mode
 RunTest blob_resume_pull \
     blob_cli_trans_resume blob_srv_trans_resume -- -argstest use-pull-mode=1
-
-overlay=overlay_psa_conf
-RunTest blob_resume_pull_psa \
-    blob_cli_trans_resume blob_srv_trans_resume -- -argstest use-pull-mode=1