tests: Bluetooth: Mesh: add cfg mesh with mbedtls PSA to bsim CI

Commit adds configuration for mesh with mbedtls PSA
to CI BabbleSim tests as well as emulation of
the Internal Trustable Storage(ITS) based on Zephyr's
settings to run in parallel environment.

Signed-off-by: Aleksandr Khromykh <aleksandr.khromykh@nordicsemi.no>

modules/mbedtls/configs/config-tls-generic.h

@@ -481,6 +481,19 @@
 #include CONFIG_MBEDTLS_USER_CONFIG_FILE
 #endif
 
+#if !defined(CONFIG_MBEDTLS_PSA_CRYPTO_C)
+/* When PSA API is used the checking header is included over the chain:
+ * |-psa/crypto.h
+ * |-psa/crypto_platform.h
+ * |-mbedtls/build_info.h
+ * |-mbedtls/check_config.h
+ * If include this header here then PSA API will be in semiconfigured state
+ * without considering dependencies from mbedtls/config_psa.h.
+ * mbedtls/config_psa.h should be included right after config-tls-generic.h before checking.
+ * Formally, all settings are correct but mbedtls library cannot be built.
+ * The behavior was introduced after adding mbedTLS 3.4.0
+ */
 #include "mbedtls/check_config.h"
+#endif
 
 #endif /* MBEDTLS_CONFIG_H */

subsys/bluetooth/mesh/adv.h

@@ -14,7 +14,7 @@
 
 #define BT_MESH_ADV_SCAN_UNIT(_ms) ((_ms) * 8 / 5)
 
-#if defined(CONFIG_BT_EXT_ADV)
+#if defined(CONFIG_BT_EXT_ADV) && !defined(CONFIG_BT_LL_SW_SPLIT)
 #define BT_MESH_SCAN_INTERVAL_MS 3000
 #define BT_MESH_SCAN_WINDOW_MS   3000
 #else

tests/bsim/bluetooth/mesh/CMakeLists.txt

@@ -37,6 +37,7 @@ if(CONFIG_SETTINGS)
 if(CONFIG_BT_MESH_USES_MBEDTLS_PSA)
  target_sources(app PRIVATE
   src/distribute_keyid.c
+  src/psa_its_emul.c
  )
 endif()
 
@@ -82,3 +83,15 @@ zephyr_include_directories(
   ${BSIM_COMPONENTS_PATH}/libUtilv1/src/
   ${BSIM_COMPONENTS_PATH}/libPhyComv1/src/
 )
+
+# The mbedTLS PSA ITS is not thread safe.
+# The issue: https://github.com/zephyrproject-rtos/zephyr/issues/59362
+# Also, it isn't possible to use "native" ITS implementation since
+# mbedTLS includes headers that do not exist.
+# This linker option allows linking custom ITS implementation instead of
+# precompiled objects from the mbedTLS library to run it in parallel.
+if(CONFIG_BT_MESH_USES_MBEDTLS_PSA)
+  zephyr_ld_options(
+    ${LINKERFLAGPREFIX},--allow-multiple-definition
+    )
+endif()

tests/bsim/bluetooth/mesh/compile.sh

@@ -28,5 +28,12 @@ app=tests/bsim/bluetooth/mesh \
   conf_file=prj_mesh1d1.conf conf_overlay=overlay_gatt.conf compile
 app=tests/bsim/bluetooth/mesh \
   conf_file=prj_mesh1d1.conf conf_overlay=overlay_low_lat.conf compile
+app=tests/bsim/bluetooth/mesh conf_file=prj_mesh1d1.conf conf_overlay=overlay_psa.conf compile
+app=tests/bsim/bluetooth/mesh \
+  conf_file=prj_mesh1d1.conf conf_overlay="overlay_pst.conf;overlay_psa.conf" compile
+app=tests/bsim/bluetooth/mesh \
+  conf_file=prj_mesh1d1.conf conf_overlay="overlay_gatt.conf;overlay_psa.conf" compile
+app=tests/bsim/bluetooth/mesh \
+  conf_file=prj_mesh1d1.conf conf_overlay="overlay_low_lat.conf;overlay_psa.conf" compile
 
 wait_for_background_jobs

tests/bsim/bluetooth/mesh/overlay_psa.conf

@@ -0,0 +1,2 @@
+# Enable mbedTLS PSA as a crypto backend
+CONFIG_BT_MESH_USES_MBEDTLS_PSA=y

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

@@ -70,13 +70,3 @@ void bt_mesh_user_keyid_assign(psa_key_id_t key_id)
 		LOG_WRN("key id %d is out of the reserved id range", key_id);
 	}
 }
-
-void stored_keys_clear(void)
-{
-	struct bt_mesh_key key;
-
-	for (int i = 0; i < BT_MESH_KEY_ID_RANGE_SIZE; i++) {
-		key.key = BT_MESH_TEST_PSA_KEY_ID_USER_MIN + i;
-		bt_mesh_key_destroy(&key);
-	}
-}

tests/bsim/bluetooth/mesh/src/distribute_keyid.h

@@ -1,17 +0,0 @@
-/*
- * Copyright (c) 2023 Nordic Semiconductor ASA
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-#ifndef TESTS_BSIM_BLUETOOTH_MESH_SRC_DISTRIBUTE_KEYID_H_
-#define TESTS_BSIM_BLUETOOTH_MESH_SRC_DISTRIBUTE_KEYID_H_
-
-#if defined CONFIG_BT_MESH_USES_MBEDTLS_PSA
-void stored_keys_clear(void);
-#else
-static inline void stored_keys_clear(void)
-{}
-#endif
-
-#endif /* TESTS_BSIM_BLUETOOTH_MESH_SRC_DISTRIBUTE_KEYID_H_ */

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

@@ -7,7 +7,6 @@
 #include "argparse.h"
 #include <bs_pc_backchannel.h>
 #include "settings_test_backend.h"
-#include "distribute_keyid.h"
 #include "mesh/crypto.h"
 
 #define LOG_MODULE_NAME mesh_test
@@ -557,7 +556,6 @@ void bt_mesh_test_host_files_remove(void)
 #if defined(CONFIG_SETTINGS)
 	/* crypto library initialization to be able to remove stored keys. */
 	bt_mesh_crypto_init();
-	stored_keys_clear();
 	settings_test_backend_clear();
 #endif
 }

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

@@ -0,0 +1,209 @@
+/*
+ * Copyright (c) 2023 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+/*
+ *  PSA ITS emulator over settings.
+ */
+
+#include <stdlib.h>
+
+#include <zephyr/bluetooth/mesh.h>
+#include <../library/psa_crypto_its.h>
+
+#define LOG_MODULE_NAME pts_its_emu
+
+#include <zephyr/logging/log.h>
+#include "mesh/net.h"
+#include "mesh/settings.h"
+
+LOG_MODULE_REGISTER(LOG_MODULE_NAME, LOG_LEVEL_INF);
+
+/* The value of 52 bytes was measured practically in the mbedTLS psa security storage. */
+#define MAX_ITEM_LENGTH 52
+#define MAX_ITEM_NUMBER MBEDTLS_PSA_KEY_SLOT_COUNT
+
+typedef struct {
+	uint32_t size;
+	psa_storage_create_flags_t flags;
+	uint8_t data[MAX_ITEM_LENGTH];
+} psa_its_pst_item_t;
+
+typedef struct {
+	psa_storage_uid_t uid;
+	psa_its_pst_item_t pst_item;
+} psa_its_item_t;
+
+static psa_its_item_t item[MAX_ITEM_NUMBER];
+
+static psa_its_item_t *get_item_by_uid(psa_storage_uid_t uid)
+{
+	for (int i = 0; i < MAX_ITEM_NUMBER; i++) {
+		if (uid == item[i].uid) {
+			return &item[i];
+		}
+	}
+
+	return NULL;
+}
+
+static int itsemul_set(const char *name, size_t len_rd, settings_read_cb read_cb, void *cb_arg)
+{
+	ssize_t len;
+	uint64_t uid;
+	psa_its_item_t *p_item;
+
+	LOG_DBG("read out uid: %s", name);
+
+	if (!name) {
+		LOG_ERR("Insufficient number of arguments");
+		return -ENOENT;
+	}
+
+	uid = strtoull(name, NULL, 10);
+	if (uid == ULLONG_MAX) {
+		LOG_ERR("Invalid format for uid");
+		return -EINVAL;
+	}
+
+	p_item = get_item_by_uid(uid);
+	if (p_item == NULL) {
+		p_item = get_item_by_uid(0ull);
+	}
+
+	if (p_item == NULL) {
+		LOG_ERR("Insufficient sources for %llu", uid);
+		return -EINVAL;
+	}
+
+	p_item->uid = uid;
+
+	len = read_cb(cb_arg, &p_item->pst_item, len_rd);
+	if (len < 0) {
+		LOG_ERR("Failed to read value (err %zd)", len);
+		return -EINVAL;
+	}
+
+	LOG_HEXDUMP_DBG(&p_item->pst_item, len, "pst_item:");
+
+	if (len != len_rd) {
+		LOG_ERR("Unexpected length (%zd != %zu)", len, len_rd);
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
+BT_MESH_SETTINGS_DEFINE(psa_its_emu, "itsemul", itsemul_set);
+
+psa_status_t psa_its_get_info(psa_storage_uid_t uid, struct psa_storage_info_t *p_info)
+{
+	psa_its_item_t *p_item;
+
+	LOG_DBG("get info uid: %llu", uid);
+
+	p_item = get_item_by_uid(uid);
+	if (p_item == NULL) {
+		return PSA_ERROR_DOES_NOT_EXIST;
+	}
+
+	p_info->flags = p_item->pst_item.flags;
+	p_info->size = p_item->pst_item.size;
+
+	LOG_DBG("flags: %lu, size: %lu", p_info->flags, p_info->size);
+
+	return PSA_SUCCESS;
+}
+
+psa_status_t psa_its_get(psa_storage_uid_t uid, uint32_t data_offset, uint32_t data_length,
+			 void *p_data, size_t *p_data_length)
+{
+	psa_its_item_t *p_item;
+	psa_its_pst_item_t *p_pst_item;
+
+	LOG_DBG("get uid: %llu", uid);
+
+	p_item = get_item_by_uid(uid);
+	if (p_item == NULL) {
+		return PSA_ERROR_DOES_NOT_EXIST;
+	}
+
+	p_pst_item = &p_item->pst_item;
+
+	if (data_offset > p_pst_item->size) {
+		return PSA_ERROR_DATA_CORRUPT;
+	}
+
+	*p_data_length = MIN(p_pst_item->size - data_offset, data_length);
+	memcpy(p_data, p_pst_item->data + data_offset, *p_data_length);
+
+	return PSA_SUCCESS;
+}
+
+psa_status_t psa_its_set(psa_storage_uid_t uid, uint32_t data_length, const void *p_data,
+			 psa_storage_create_flags_t create_flags)
+{
+	char path[40];
+	psa_its_item_t *p_item;
+	psa_its_pst_item_t *p_pst_item;
+	psa_status_t status = PSA_SUCCESS;
+
+	LOG_DBG("Set uid: %llu, len: %lu", uid, data_length);
+
+	if (data_length > MAX_ITEM_LENGTH) {
+		LOG_ERR("Too long item data: %lu > " STRINGIFY(MAX_ITEM_LENGTH), data_length);
+	}
+
+	p_item = get_item_by_uid(uid);
+	if (p_item == NULL) {
+		p_item = get_item_by_uid(0ull);
+	}
+
+	if (p_item == NULL) {
+		return PSA_ERROR_STORAGE_FAILURE;
+	}
+
+	snprintk(path, sizeof(path), "bt/mesh/itsemul/%llu", uid);
+
+	p_item->uid = uid;
+	p_pst_item = &p_item->pst_item;
+	p_pst_item->size = data_length;
+	p_pst_item->flags = create_flags;
+	memcpy(p_pst_item->data, p_data, data_length);
+
+	if (settings_save_one(path, p_pst_item, sizeof(psa_its_pst_item_t))) {
+		LOG_ERR("Failed to store its item: %s", path);
+		status = PSA_ERROR_STORAGE_FAILURE;
+	} else {
+		LOG_DBG("Stored its item: %s", path);
+	}
+
+	return status;
+}
+
+psa_status_t psa_its_remove(psa_storage_uid_t uid)
+{
+	char path[40];
+	psa_status_t status = PSA_SUCCESS;
+	psa_its_item_t *p_item;
+
+	LOG_DBG("remove uid: %llu", uid);
+
+	p_item = get_item_by_uid(uid);
+	if (p_item == NULL) {
+		return status;
+	}
+	memset(p_item, 0, sizeof(psa_its_item_t));
+
+	snprintk(path, sizeof(path), "bt/mesh/itsemul/%llu", uid);
+
+	if (settings_delete(path)) {
+		LOG_ERR("Failed to remove its item: %s", path);
+		status = PSA_ERROR_STORAGE_FAILURE;
+	} else {
+		LOG_DBG("Removed its item: %s", path);
+	}
+
+	return status;
+}

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

@@ -10,3 +10,8 @@ RunTest mesh_access_publication_cancel \
 conf=prj_mesh1d1_conf
 RunTest mesh_access_publication_cancel_1d1 \
 	access_tx_cancel access_rx_cancel
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_access_publication_cancel_psa \
+	access_tx_cancel access_rx_cancel

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

@@ -10,3 +10,8 @@ RunTest mesh_access_extended_model_subs \
 conf=prj_mesh1d1_conf
 RunTest mesh_access_extended_model_subs_1d1 \
 	access_tx_ext_model access_sub_ext_model
+
+conf=prj_mesh1d1_conf
+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_ext_sub_cap.sh

@@ -8,3 +8,7 @@ RunTest mesh_access_extended_model_subs_cap access_sub_capacity_ext_model
 
 conf=prj_mesh1d1_conf
 RunTest mesh_access_extended_model_subs_cap_1d1 access_sub_capacity_ext_model
+
+conf=prj_mesh1d1_conf
+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_period.sh

@@ -10,3 +10,8 @@ RunTest mesh_access_per_pub \
 conf=prj_mesh1d1_conf
 RunTest mesh_access_per_pub_1d1 \
 	access_tx_period access_rx_period
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_access_per_pub_psa \
+	access_tx_period access_rx_period

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

@@ -10,3 +10,8 @@ RunTest mesh_access_pub_retr \
 conf=prj_mesh1d1_conf
 RunTest mesh_access_pub_retr_1d1 \
 	access_tx_transmit access_rx_transmit
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_access_pub_retr_psa \
+	access_tx_period access_rx_period

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

@@ -24,3 +24,7 @@ RunTest mesh_adv_proxy_mixin adv_tx_proxy_mixin adv_rx_proxy_mixin
 conf=prj_mesh1d1_conf
 overlay=overlay_gatt_conf
 RunTest mesh_adv_proxy_mixin_1d1 adv_tx_proxy_mixin adv_rx_proxy_mixin
+
+conf=prj_mesh1d1_conf
+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/random_order.sh

@@ -9,3 +9,7 @@ RunTest mesh_adv_random_order adv_tx_random_order adv_rx_random_order
 
 conf=prj_mesh1d1_conf
 RunTest mesh_adv_random_order_1d1 adv_tx_random_order adv_rx_random_order
+
+conf=prj_mesh1d1_conf
+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/reverse_order.sh

@@ -9,3 +9,7 @@ RunTest mesh_adv_reverse_order adv_tx_reverse_order adv_rx_receive_order
 
 conf=prj_mesh1d1_conf
 RunTest mesh_adv_reverse_order_1d1 adv_tx_reverse_order adv_rx_receive_order
+
+conf=prj_mesh1d1_conf
+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/send_order.sh

@@ -9,3 +9,7 @@ RunTest mesh_adv_send_order adv_tx_send_order adv_rx_receive_order
 
 conf=prj_mesh1d1_conf
 RunTest mesh_adv_send_order_1d1 adv_tx_send_order adv_rx_receive_order
+
+conf=prj_mesh1d1_conf
+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/tx_cb_multi.sh

@@ -9,3 +9,7 @@ RunTest mesh_adv_tx_cb_multi adv_tx_cb_multi
 
 conf=prj_mesh1d1_conf
 RunTest mesh_adv_tx_cb_multi_1d1 adv_tx_cb_multi
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_adv_tx_cb_multi_psa adv_tx_cb_multi

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

@@ -9,3 +9,7 @@ RunTest mesh_adv_tx_cb_single adv_tx_cb_single adv_rx_xmit
 
 conf=prj_mesh1d1_conf
 RunTest mesh_adv_tx_cb_single_1d1 adv_tx_cb_single adv_rx_xmit
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_adv_tx_cb_single_psa adv_tx_cb_single adv_rx_xmit

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

@@ -26,3 +26,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_beacon_interval_1d1 \
 	beacon_tx_secure_beacon_interval \
 	beacon_rx_secure_beacon_interval
+
+conf=prj_mesh1d1_conf
+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/invalid.sh

@@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_beacon_invalid_1d1 \
 	beacon_tx_invalid \
 	beacon_rx_invalid
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_beacon_invalid_psa \
+	beacon_tx_invalid \
+	beacon_rx_invalid

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

@@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_beacon_on_iv_update_1d1 \
 	beacon_tx_on_iv_update \
 	beacon_rx_on_iv_update
+
+conf=prj_mesh1d1_conf
+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/key_refresh.sh

@@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_beacon_on_key_refresh_1d1 \
 	beacon_tx_on_key_refresh \
 	beacon_rx_on_key_refresh
+
+conf=prj_mesh1d1_conf
+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/kr_old_key.sh

@@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_beacon_kr_old_key_1d1 \
 	beacon_tx_kr_old_key \
 	beacon_rx_kr_old_key
+
+conf=prj_mesh1d1_conf
+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/multiple_netkeys.sh

@@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_beacon_multiple_netkeys_1d1 \
 	beacon_tx_multiple_netkeys \
 	beacon_rx_multiple_netkeys
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_beacon_multiple_netkeys_psa \
+	beacon_tx_multiple_netkeys \
+	beacon_rx_multiple_netkeys

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

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2022 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
-
-conf=prj_mesh1d1_conf
-RunTest blob_broadcast_basic \
-	blob_cli_broadcast_basic
-
-conf=prj_mesh1d1_conf
-RunTest blob_broadcast_trans \
-	blob_cli_broadcast_trans
-
-conf=prj_mesh1d1_conf
-RunTest blob_broadcast_unicast_seq \
-	blob_cli_broadcast_unicast_seq
-
-conf=prj_mesh1d1_conf
-RunTest blob_broadcast_unicast \
-	blob_cli_broadcast_unicast

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

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Copyright 2023 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+conf=prj_mesh1d1_conf
+RunTest blob_broadcast_basic blob_cli_broadcast_basic
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest blob_broadcast_basic_psa blob_cli_broadcast_basic

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

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Copyright 2023 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+conf=prj_mesh1d1_conf
+RunTest blob_broadcast_trans blob_cli_broadcast_trans
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest blob_broadcast_trans_psa blob_cli_broadcast_trans

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

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Copyright 2023 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+conf=prj_mesh1d1_conf
+RunTest blob_broadcast_unicast blob_cli_broadcast_unicast
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest blob_broadcast_unicast_psa blob_cli_broadcast_unicast

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

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Copyright 2023 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+conf=prj_mesh1d1_conf
+RunTest blob_broadcast_unicast_seq blob_cli_broadcast_unicast_seq
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest blob_broadcast_unicast_seq_psa blob_cli_broadcast_unicast_seq

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

@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2022 Nordic Semiconductor
-# SPDX-License-Identifier: Apache-2.0
-
-source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
-
-# The test instance sequence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
-RunTest blob_caps_all_rsp \
-	blob_cli_caps_all_rsp blob_srv_caps_standard blob_srv_caps_standard
-
-# The test instance sequence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
-RunTest blob_caps_partial_rsp \
-	blob_cli_caps_partial_rsp blob_srv_caps_standard blob_srv_caps_no_rsp
-
-# The test instance sequence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
-RunTest blob_caps_no_rsp \
-	blob_cli_caps_no_rsp blob_srv_caps_no_rsp blob_srv_caps_no_rsp
-
-# The test instance seqence must stay as it is due to addressing scheme
-conf=prj_mesh1d1_conf
-RunTest blob_caps_cancelled \
-	blob_cli_caps_cancelled blob_srv_caps_standard

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

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Copyright 2023 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+# The test instance sequence must stay as it is due to addressing scheme
+conf=prj_mesh1d1_conf
+RunTest blob_caps_all_rsp \
+	blob_cli_caps_all_rsp blob_srv_caps_standard blob_srv_caps_standard
+
+conf=prj_mesh1d1_conf
+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_caps_cancelled.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Copyright 2023 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+# The test instance seqence must stay as it is due to addressing scheme
+conf=prj_mesh1d1_conf
+RunTest blob_caps_cancelled \
+	blob_cli_caps_cancelled blob_srv_caps_standard
+
+conf=prj_mesh1d1_conf
+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_no_rsp.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Copyright 2023 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+# The test instance sequence must stay as it is due to addressing scheme
+conf=prj_mesh1d1_conf
+RunTest blob_caps_no_rsp \
+	blob_cli_caps_no_rsp blob_srv_caps_no_rsp blob_srv_caps_no_rsp
+
+conf=prj_mesh1d1_conf
+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_partial_rsp.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# Copyright 2023 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+# The test instance sequence must stay as it is due to addressing scheme
+conf=prj_mesh1d1_conf
+RunTest blob_caps_partial_rsp \
+	blob_cli_caps_partial_rsp blob_srv_caps_standard blob_srv_caps_no_rsp
+
+conf=prj_mesh1d1_conf
+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_friend.sh

@@ -15,3 +15,13 @@ RunTest blob_transfer_lpn \
 	blob_srv_lpn_pull \
 	blob_srv_lpn_pull \
 	blob_srv_lpn_pull
+
+conf=prj_mesh1d1_conf
+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_no_rsp_block.sh

@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+# Copyright 2023 Nordic Semiconductor
+# SPDX-License-Identifier: Apache-2.0
+
+source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
+
+conf=prj_mesh1d1_conf
+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
+
+conf=prj_mesh1d1_conf
+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_no_rsp_xfer.sh

@@ -4,14 +4,15 @@
 
 source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 
-conf=prj_mesh1d1_conf
-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
-
 conf=prj_mesh1d1_conf
 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
+
+conf=prj_mesh1d1_conf
+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_persistent_transfer.sh

@@ -12,3 +12,12 @@ RunTest blob_fail \
 	blob_srv_fail_on_block_get \
 	blob_srv_fail_on_xfer_get \
 	blob_srv_fail_on_nothing
+
+conf=prj_mesh1d1_conf
+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_persistent_transfer_pull.sh

@@ -10,3 +10,10 @@ RunTest blob_pst_pull \
 	blob_cli_trans_persistency_pull \
 	blob_srv_trans_persistency_pull \
 	blob_srv_trans_persistency_pull
+
+conf=prj_mesh1d1_conf
+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_trans_complete_pull.sh

@@ -10,3 +10,10 @@ 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
+
+conf=prj_mesh1d1_conf
+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_trans_complete_push.sh

@@ -9,3 +9,9 @@ conf=prj_mesh1d1_conf
 RunTest blob_success_push blob_cli_trans_complete \
 	blob_srv_trans_complete blob_srv_trans_complete \
 	blob_srv_trans_complete blob_srv_trans_complete
+
+conf=prj_mesh1d1_conf
+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_resume_pull.sh

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

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

@@ -7,3 +7,7 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # Test that BLOB Client can resume a suspended BLOB Transfer in Push mode
 conf=prj_mesh1d1_conf
 RunTest blob_resume_push blob_cli_trans_resume blob_srv_trans_resume
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest blob_resume_push_psa blob_cli_trans_resume blob_srv_trans_resume

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

@@ -39,3 +39,35 @@ conf=prj_mesh1d1_conf
 overlay=overlay_pst_conf
 RunTest blob_recover_phase blob_cli_stop blob_srv_stop -- -argstest \
    recover=1 expected-phase=4
+
+# The same test but with PSA crypto
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest blob_recover_phase_psa blob_cli_stop blob_srv_stop -- -argstest \
+   recover=0 expected-phase=1
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest blob_recover_phase_psa blob_cli_stop blob_srv_stop -- -argstest \
+   recover=1 expected-phase=2
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest blob_recover_phase_psa blob_cli_stop blob_srv_stop -- -argstest \
+   recover=1 expected-phase=3
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest blob_recover_phase_psa blob_cli_stop blob_srv_stop -- -argstest \
+   recover=1 expected-phase=4
+
+# Test reaching suspended state and continuation after reboot on new procedure.
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest blob_recover_phase_psa blob_cli_stop blob_srv_stop -- -argstest \
+   recover=0 expected-phase=5
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest blob_recover_phase_psa blob_cli_stop blob_srv_stop -- -argstest \
+   recover=1 expected-phase=4

tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_apply.sh

@@ -16,3 +16,12 @@ RunTest dfu_all_tgts_lost_on_apply \
 	dfu_target_fail_on_apply \
 	dfu_target_fail_on_apply \
 	-- -argstest targets=3
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_all_tgts_lost_on_apply_psa \
+	dfu_cli_all_targets_lost_on_apply \
+	dfu_target_fail_on_apply \
+	dfu_target_fail_on_apply \
+	dfu_target_fail_on_apply \
+	-- -argstest targets=3

tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_caps_get.sh

@@ -16,3 +16,12 @@ RunTest dfu_all_tgts_lost_on_caps_get \
 	dfu_target_fail_on_caps_get \
 	dfu_target_fail_on_caps_get \
 	-- -argstest targets=3
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_all_tgts_lost_on_caps_get_psa \
+	dfu_cli_all_targets_lost_on_caps_get \
+	dfu_target_fail_on_caps_get \
+	dfu_target_fail_on_caps_get \
+	dfu_target_fail_on_caps_get \
+	-- -argstest targets=3

tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_metadata.sh

@@ -16,3 +16,12 @@ RunTest dfu_all_tgts_lost_on_metadata \
 	dfu_target_fail_on_metadata \
 	dfu_target_fail_on_metadata \
 	-- -argstest targets=3
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_all_tgts_lost_on_metadata_psa \
+	dfu_cli_all_targets_lost_on_metadata \
+	dfu_target_fail_on_metadata \
+	dfu_target_fail_on_metadata \
+	dfu_target_fail_on_metadata \
+	-- -argstest targets=3

tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_update_get.sh

@@ -16,3 +16,12 @@ RunTest dfu_all_tgts_lost_on_update_get \
 	dfu_target_fail_on_update_get \
 	dfu_target_fail_on_update_get \
 	-- -argstest targets=3
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_all_tgts_lost_on_update_get_psa \
+	dfu_cli_all_targets_lost_on_update_get \
+	dfu_target_fail_on_update_get \
+	dfu_target_fail_on_update_get \
+	dfu_target_fail_on_update_get \
+	-- -argstest targets=3

tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_all_targets_lost_on_verify.sh

@@ -16,3 +16,12 @@ RunTest dfu_all_tgts_lost_on_verify \
 	dfu_target_fail_on_verify \
 	dfu_target_fail_on_verify \
 	-- -argstest targets=3
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_all_tgts_lost_on_verify_psa \
+	dfu_cli_all_targets_lost_on_verify \
+	dfu_target_fail_on_verify \
+	dfu_target_fail_on_verify \
+	dfu_target_fail_on_verify \
+	-- -argstest targets=3

tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_cli_persistent_transfer.sh

@@ -15,3 +15,14 @@ RunTest dfu_persistency \
 	dfu_target_fail_on_verify \
 	dfu_target_fail_on_apply \
 	dfu_target_fail_on_nothing
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_persistency_psa \
+	dfu_cli_fail_on_persistency \
+	dfu_target_fail_on_metadata \
+	dfu_target_fail_on_caps_get \
+	dfu_target_fail_on_update_get \
+	dfu_target_fail_on_verify \
+	dfu_target_fail_on_apply \
+	dfu_target_fail_on_nothing

tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update.sh

@@ -7,3 +7,7 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 conf=prj_mesh1d1_conf
 overlay=overlay_pst_conf
 RunTest dfu_self_update dfu_dist_dfu_self_update -- -argstest targets=1
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_self_update_psa dfu_dist_dfu_self_update -- -argstest targets=1

tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_dist_self_update_mult_targets.sh

@@ -8,3 +8,8 @@ conf=prj_mesh1d1_conf
 overlay=overlay_pst_conf
 RunTest dfu_self_update_no_change \
     dfu_dist_dfu_self_update dfu_target_dfu_no_change -- -argstest targets=2
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_self_update_no_change_psa \
+    dfu_dist_dfu_self_update dfu_target_dfu_no_change -- -argstest targets=2

tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed.sh

@@ -9,3 +9,8 @@ conf=prj_mesh1d1_conf
 overlay=overlay_pst_conf
 RunTest dfu_mixed dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \
 	dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_mixed_psa dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \
+	dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4

tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_mixed_fail.sh

@@ -10,3 +10,9 @@ overlay=overlay_pst_conf
 RunTest dfu_mixed_fail dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \
 	dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4 \
 	fail-confirm=1
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_mixed_fail_psa dfu_dist_dfu dfu_target_dfu_unprov dfu_target_dfu_no_change \
+	dfu_target_dfu_new_comp_rpr dfu_target_dfu_new_comp_no_rpr -- -argstest targets=4 \
+	fail-confirm=1

tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_slot.sh

@@ -20,3 +20,13 @@ RunTest dfu_slot dfu_dist_dfu_slot_create_recover
 RunTest dfu_slot dfu_dist_dfu_slot_delete_all
 
 RunTest dfu_slot dfu_dist_dfu_slot_check_delete_all
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_slot_psa dfu_dist_dfu_slot_create
+
+RunTest dfu_slot_psa dfu_dist_dfu_slot_create_recover
+
+RunTest dfu_slot_psa dfu_dist_dfu_slot_delete_all
+
+RunTest dfu_slot_psa dfu_dist_dfu_slot_check_delete_all

tests/bsim/bluetooth/mesh/tests_scripts/dfu/dfu_srv_persistence.sh

@@ -50,3 +50,42 @@ conf=prj_mesh1d1_conf
 overlay=overlay_pst_conf
 RunTest dfu_dist_recover_phase dfu_cli_stop dfu_target_dfu_stop -- -argstest \
    recover=1 expected-phase=6
+
+# The same test but with PSA crypto
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_dist_recover_phase_psa dfu_cli_stop dfu_target_dfu_stop -- -argstest \
+   recover=0 expected-phase=2
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_dist_recover_phase_psa dfu_cli_stop dfu_target_dfu_stop  -- -argstest \
+  recover=1 expected-phase=3
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_dist_recover_phase_psa dfu_cli_stop dfu_target_dfu_stop -- -argstest \
+  recover=1 expected-phase=4
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_dist_recover_phase_psa dfu_cli_stop dfu_target_dfu_stop -- -argstest \
+  recover=1 expected-phase=6
+
+# Use phase `BT_MESH_DFU_PHASE_APPLY_SUCCESS` as marker to bring whole procedure to an end
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_dist_recover_phase_psa dfu_cli_stop dfu_target_dfu_stop -- -argstest \
+  recover=1 expected-phase=8
+
+# To test recovery from Verify Fail begin new distribution that will end there,
+# reboot devices and continue to Applying.
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_dist_recover_phase_psa dfu_cli_stop dfu_target_dfu_stop -- -argstest \
+   recover=0 expected-phase=5
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest dfu_dist_recover_phase_psa dfu_cli_stop dfu_target_dfu_stop -- -argstest \
+   recover=1 expected-phase=6

tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish.sh

@@ -13,3 +13,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_friendship_est_1d1 \
 	friendship_friend_est \
 	friendship_lpn_est
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_friendship_est_psa \
+	friendship_friend_est \
+	friendship_lpn_est

tests/bsim/bluetooth/mesh/tests_scripts/friendship/establish_multi.sh

@@ -22,3 +22,13 @@ RunTest mesh_friendship_est_multi_1d1 \
 	friendship_lpn_est \
 	friendship_lpn_est \
 	friendship_lpn_est
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_friendship_est_multi_psa \
+	friendship_friend_est_multi \
+	friendship_lpn_est \
+	friendship_lpn_est \
+	friendship_lpn_est \
+	friendship_lpn_est \
+	friendship_lpn_est

tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_disable.sh

@@ -20,3 +20,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_lpn_disable_check_1d1 \
 	friendship_friend_no_est \
 	friendship_lpn_disable
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_lpn_disable_check_psa \
+	friendship_friend_no_est \
+	friendship_lpn_disable

tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_loopback.sh

@@ -13,3 +13,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_friendship_lpn_loopback_1d1 \
 	friendship_lpn_loopback \
 	friendship_friend_est
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_friendship_lpn_loopback_psa \
+	friendship_lpn_loopback \
+	friendship_friend_est

tests/bsim/bluetooth/mesh/tests_scripts/friendship/lpn_terminate_cb.sh

@@ -18,3 +18,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_lpn_terminate_cb_check_1d1 \
 	friendship_friend_est \
 	friendship_lpn_term_cb_check
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_lpn_terminate_cb_check_psa \
+	friendship_friend_est \
+	friendship_lpn_term_cb_check

tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_frnd.sh

@@ -13,3 +13,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_friendship_msg_frnd_1d1 \
 	friendship_friend_msg \
 	friendship_lpn_msg_frnd
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_friendship_msg_frnd_psa \
+	friendship_friend_msg \
+	friendship_lpn_msg_frnd

tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_group.sh

@@ -15,3 +15,10 @@ RunTest mesh_friendship_msg_group_1d1 \
 	friendship_lpn_group \
 	friendship_other_group \
 	friendship_friend_group
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_friendship_msg_group_psa \
+	friendship_lpn_group \
+	friendship_other_group \
+	friendship_friend_group

tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh.sh

@@ -15,3 +15,10 @@ RunTest mesh_friendship_msg_mesh_1d1 \
 	friendship_lpn_msg_mesh \
 	friendship_other_msg \
 	friendship_friend_est
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_friendship_msg_mesh_psa \
+	friendship_lpn_msg_mesh \
+	friendship_other_msg \
+	friendship_friend_est

tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_mesh_low_lat.sh

@@ -17,3 +17,10 @@ RunTest mesh_friendship_msg_mesh_low_lat_1d1 \
 	friendship_lpn_msg_mesh \
 	friendship_other_msg \
 	friendship_friend_est
+
+conf=prj_mesh1d1_conf
+overlay="overlay_low_lat_conf_overlay_psa_conf"
+RunTest mesh_friendship_msg_mesh_low_lat_psa \
+	friendship_lpn_msg_mesh \
+	friendship_other_msg \
+	friendship_friend_est

tests/bsim/bluetooth/mesh/tests_scripts/friendship/msg_va_collision.sh

@@ -28,3 +28,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_friendship_msg_va_collision_1d1 \
 	friendship_lpn_va_collision \
 	friendship_friend_va_collision
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_friendship_msg_va_collision_psa \
+	friendship_lpn_va_collision \
+	friendship_friend_va_collision

tests/bsim/bluetooth/mesh/tests_scripts/friendship/overflow.sh

@@ -13,3 +13,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_friendship_overflow_1d1 \
 	friendship_friend_overflow \
 	friendship_lpn_overflow
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_friendship_overflow_psa \
+	friendship_friend_overflow \
+	friendship_lpn_overflow

tests/bsim/bluetooth/mesh/tests_scripts/friendship/poll.sh

@@ -13,3 +13,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_friendship_poll_1d1 \
 	friendship_friend_est \
 	friendship_lpn_poll
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_friendship_poll_psa \
+	friendship_friend_est \
+	friendship_lpn_poll

tests/bsim/bluetooth/mesh/tests_scripts/friendship/re-establish.sh

@@ -13,3 +13,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_friendship_re_est_1d1 \
 	friendship_friend_est \
 	friendship_lpn_re_est
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_friendship_re_est_psa \
+	friendship_friend_est \
+	friendship_lpn_re_est

tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_all.sh

@@ -15,3 +15,10 @@ RunTest mesh_heartbeat_sub_cb_api_all_1d1 \
 	heartbeat_publish_all \
 	heartbeat_publish_all \
 	heartbeat_subscribe_all
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_heartbeat_sub_cb_api_all_psa \
+	heartbeat_publish_all \
+	heartbeat_publish_all \
+	heartbeat_subscribe_all

tests/bsim/bluetooth/mesh/tests_scripts/heartbeat/sub_cb_api_unicast.sh

@@ -15,3 +15,10 @@ RunTest mesh_heartbeat_sub_cb_api_unicast_1d1 \
 	heartbeat_publish_unicast \
 	heartbeat_publish_unicast \
 	heartbeat_subscribe_unicast
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_heartbeat_sub_cb_api_unicast_psa \
+	heartbeat_publish_unicast \
+	heartbeat_publish_unicast \
+	heartbeat_subscribe_unicast

tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_deferring.sh

@@ -9,3 +9,7 @@ RunTest mesh_ivi_deferring ivi_ivu_deferring
 
 conf=prj_mesh1d1_conf
 RunTest mesh_ivi_deferring_1d1 ivi_ivu_deferring
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_ivi_deferring_psa ivi_ivu_deferring

tests/bsim/bluetooth/mesh/tests_scripts/iv_index/iv_recovery.sh

@@ -9,3 +9,7 @@ RunTest mesh_ivi_recovery ivi_ivu_recovery
 
 conf=prj_mesh1d1_conf
 RunTest mesh_ivi_recovery_1d1 ivi_ivu_recovery
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_ivi_recovery_psa ivi_ivu_recovery

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

@@ -9,3 +9,7 @@ RunTest mesh_ivi_update ivi_ivu_normal
 
 conf=prj_mesh1d1_conf
 RunTest mesh_ivi_update_1d1 ivi_ivu_normal
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_ivi_update_psa ivi_ivu_normal

tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_max_sdu.sh

@@ -17,3 +17,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 conf=prj_mesh1d1_conf
 RunTest mesh_lcd_test_max_access_payload \
 	lcd_cli_max_sdu_comp_data_request lcd_srv_comp_data_status_respond
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_lcd_test_max_access_payload_psa \
+	lcd_cli_max_sdu_comp_data_request lcd_srv_comp_data_status_respond

tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_comp_data_split.sh

@@ -22,3 +22,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 conf=prj_mesh1d1_conf
 RunTest mesh_lcd_test_split_comp_data \
 	lcd_cli_split_comp_data_request lcd_srv_comp_data_status_respond
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_lcd_test_split_comp_data_psa \
+	lcd_cli_split_comp_data_request lcd_srv_comp_data_status_respond

tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_max_sdu.sh

@@ -18,3 +18,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 conf=prj_mesh1d1_conf
 RunTest mesh_lcd_test_max_metadata_access_payload \
 	lcd_cli_max_sdu_metadata_request lcd_srv_metadata_status_respond
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_lcd_test_max_metadata_access_payload_psa \
+	lcd_cli_max_sdu_metadata_request lcd_srv_metadata_status_respond

tests/bsim/bluetooth/mesh/tests_scripts/large_comp_data/get_metadata_split.sh

@@ -21,3 +21,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 conf=prj_mesh1d1_conf
 RunTest mesh_lcd_test_split_metadata \
 	lcd_cli_split_metadata_request lcd_srv_metadata_status_respond
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_lcd_test_split_metadata_psa \
+	lcd_cli_split_metadata_request lcd_srv_metadata_status_respond

tests/bsim/bluetooth/mesh/tests_scripts/op_agg/full_status_msg_list.sh

@@ -25,3 +25,8 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 conf=prj_mesh1d1_conf
 RunTest mesh_op_agg_test_max_access_payload \
 	op_agg_cli_max_len_sequence_msg_send op_agg_srv_max_len_status_msg_send
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_op_agg_test_max_access_payload_psa \
+	op_agg_cli_max_len_sequence_msg_send op_agg_srv_max_len_status_msg_send

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

@@ -59,3 +59,32 @@ conf=prj_mesh1d1_conf
 overlay=overlay_pst_conf
 RunTest mesh_pst_access_data_check_1d1 persistence_access_data_load --\
 	-argstest access-cfg=not-configured
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest mesh_pst_access_data_check_psa persistence_access_data_save
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest mesh_pst_access_data_check_psa persistence_access_data_load --\
+	-argstest access-cfg=configured
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest mesh_pst_access_data_check_psa persistence_access_sub_overwrite --\
+	-argstest access-cfg=configured
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest mesh_pst_access_data_check_psa persistence_access_data_load --\
+	-argstest access-cfg=new-subs
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest mesh_pst_access_data_check_psa persistence_access_data_remove --\
+	-argstest access-cfg=new-subs
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest mesh_pst_access_data_check_psa persistence_access_data_load --\
+	-argstest access-cfg=not-configured

tests/bsim/bluetooth/mesh/tests_scripts/persistence/cfg.sh

@@ -35,3 +35,19 @@ RunTest mesh_pst_cfg_check_1d1 persistence_cfg_save -- -argstest stack-cfg=1
 conf=prj_mesh1d1_conf
 overlay=overlay_pst_conf
 RunTest mesh_pst_cfg_check_1d1 persistence_cfg_load -- -argstest stack-cfg=1
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest mesh_pst_cfg_check_psa persistence_cfg_save -- -argstest stack-cfg=0
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest mesh_pst_cfg_check_psa persistence_cfg_load -- -argstest stack-cfg=0
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest mesh_pst_cfg_check_psa persistence_cfg_save -- -argstest stack-cfg=1
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest mesh_pst_cfg_check_psa persistence_cfg_load -- -argstest stack-cfg=1

tests/bsim/bluetooth/mesh/tests_scripts/persistence/provisioning.sh

@@ -23,3 +23,11 @@ RunTest mesh_pst_prov_data_check_1d1 persistence_provisioning_data_save
 conf=prj_mesh1d1_conf
 overlay=overlay_pst_conf
 RunTest mesh_pst_prov_data_check_1d1 persistence_provisioning_data_load
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest mesh_pst_prov_data_check_psa persistence_provisioning_data_save
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest mesh_pst_prov_data_check_psa persistence_provisioning_data_load

tests/bsim/bluetooth/mesh/tests_scripts/persistence/reprovisioning.sh

@@ -27,3 +27,13 @@ conf=prj_mesh1d1_conf
 overlay=overlay_pst_conf
 RunTest mesh_pst_repr_1d1 persistence_reprovisioning_device \
 	persistence_reprovisioning_provisioner
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest mesh_pst_repr_psa persistence_reprovisioning_device \
+	persistence_reprovisioning_provisioner -- -argstest clear-settings=1
+
+conf=prj_mesh1d1_conf
+overlay="overlay_pst_conf_overlay_psa_conf"
+RunTest mesh_pst_repr_psa persistence_reprovisioning_device \
+	persistence_reprovisioning_provisioner

tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_adv.sh

@@ -8,3 +8,7 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # Test Random value changes for different Random intervals (10s, 0 - on every beacon, 30s).
 conf=prj_mesh1d1_conf
 RunTest mesh_priv_beacon_adv beacon_rx_priv_adv beacon_tx_priv_adv
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_priv_beacon_adv_psa beacon_rx_priv_adv beacon_tx_priv_adv

tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_interleave.sh

@@ -17,3 +17,7 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # - PRB is enabled, SNB is disabled. Third PRB is advertised
 conf=prj_mesh1d1_conf
 RunTest mesh_priv_beacon_interleave beacon_rx_priv_interleave beacon_tx_priv_interleave
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_priv_beacon_interleave_psa beacon_rx_priv_interleave beacon_tx_priv_interleave

tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_invalid.sh

@@ -7,3 +7,7 @@ source $(dirname "${BASH_SOURCE[0]}")/../../_mesh_test.sh
 # Test if Private Beacons with invalid data do not affect device
 conf=prj_mesh1d1_conf
 RunTest mesh_priv_beacon_invalid beacon_rx_priv_invalid beacon_tx_priv_invalid
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_priv_beacon_invalid_psa beacon_rx_priv_invalid beacon_tx_priv_invalid

tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu.sh

@@ -10,3 +10,10 @@ RunTest mesh_priv_beacon_on_iv_update \
   beacon_rx_on_iv_update \
   beacon_tx_priv_on_iv_update \
   -- -argstest rand-int=1
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_priv_beacon_on_iv_update_psa \
+  beacon_rx_on_iv_update \
+  beacon_tx_priv_on_iv_update \
+  -- -argstest rand-int=1

tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_ivu_long_interval.sh

@@ -12,3 +12,10 @@ RunTest mesh_priv_beacon_on_iv_update_long_interval \
   beacon_rx_on_iv_update \
   beacon_tx_priv_on_iv_update \
   -- -argstest rand-int=3
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_priv_beacon_on_iv_update_long_interval_psa \
+  beacon_rx_on_iv_update \
+  beacon_tx_priv_on_iv_update \
+  -- -argstest rand-int=3

tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr.sh

@@ -10,3 +10,10 @@ RunTest mesh_priv_beacon_on_key_refresh \
   beacon_rx_on_key_refresh \
   beacon_tx_priv_on_key_refresh \
   -- -argstest rand-int=1
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_priv_beacon_on_key_refresh_psa \
+  beacon_rx_on_key_refresh \
+  beacon_tx_priv_on_key_refresh \
+  -- -argstest rand-int=1

tests/bsim/bluetooth/mesh/tests_scripts/priv_beacon/priv_beacon_kr_long_interval.sh

@@ -12,3 +12,10 @@ RunTest mesh_priv_beacon_on_key_refresh_long_interval \
   beacon_rx_on_key_refresh \
   beacon_tx_priv_on_key_refresh \
   -- -argstest rand-int=3
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_priv_beacon_on_key_refresh_long_interval_psa \
+  beacon_rx_on_key_refresh \
+  beacon_tx_priv_on_key_refresh \
+  -- -argstest rand-int=3

tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_one_duration.sh

@@ -8,3 +8,7 @@ RunTest mesh_prov_iv_update_one_duration prov_provisioner_iv_update_flag_one
 
 conf=prj_mesh1d1_conf
 RunTest mesh_prov_iv_update_one_duration_1d1 prov_provisioner_iv_update_flag_one
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_prov_iv_update_one_duration_psa prov_provisioner_iv_update_flag_one

tests/bsim/bluetooth/mesh/tests_scripts/provision/ivu_flag_zero_duration.sh

@@ -8,3 +8,7 @@ RunTest mesh_prov_iv_update_zero_duration prov_provisioner_iv_update_flag_zero
 
 conf=prj_mesh1d1_conf
 RunTest mesh_prov_iv_update_zero_duration_1d1 prov_provisioner_iv_update_flag_zero
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_prov_iv_update_zero_duration_psa prov_provisioner_iv_update_flag_zero

tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_multi.sh

@@ -19,3 +19,11 @@ RunTest mesh_prov_pb_adv_multi_1d1 \
 	prov_device_pb_adv_no_oob \
 	prov_device_pb_adv_no_oob \
 	prov_device_pb_adv_no_oob
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_prov_pb_adv_multi_psa \
+	prov_provisioner_pb_adv_multi \
+	prov_device_pb_adv_no_oob \
+	prov_device_pb_adv_no_oob \
+	prov_device_pb_adv_no_oob

tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_no_oob.sh

@@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_prov_pb_adv_on_oob_1d1 \
 	prov_device_pb_adv_no_oob \
 	prov_provisioner_pb_adv_no_oob
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_prov_pb_adv_on_oob_psa \
+	prov_device_pb_adv_no_oob \
+	prov_provisioner_pb_adv_no_oob

tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ib_pk.sh

@@ -11,3 +11,8 @@ RunTest mesh_prov_pb_adv_oob_auth \
 conf=prj_mesh1d1_conf
 RunTest mesh_prov_pb_adv_oob_auth_1d1 \
 	prov_device_pb_adv_oob_auth prov_provisioner_pb_adv_oob_auth
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_prov_pb_adv_oob_auth_psa \
+	prov_device_pb_adv_oob_auth prov_provisioner_pb_adv_oob_auth

tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_ignore_oob_pk.sh

@@ -12,3 +12,8 @@ RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk \
 conf=prj_mesh1d1_conf
 RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk_1d1 \
 	prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_auth_no_oob_public_key
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_prov_pb_adv_device_w_oob_pk_prvnr_wt_pk_psa \
+	prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_auth_no_oob_public_key

tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_oob_auth_oob_pk.sh

@@ -11,3 +11,8 @@ RunTest mesh_prov_pb_adv_oob_public_key \
 conf=prj_mesh1d1_conf
 RunTest mesh_prov_pb_adv_oob_public_key_1d1 \
 	prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_public_key
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_prov_pb_adv_oob_public_key_psa \
+	prov_device_pb_adv_oob_public_key prov_provisioner_pb_adv_oob_public_key

tests/bsim/bluetooth/mesh/tests_scripts/provision/pb_adv_reprovision.sh

@@ -12,3 +12,9 @@ conf=prj_mesh1d1_conf
 RunTest mesh_prov_pb_adv_repr_1d1 \
 	prov_device_pb_adv_reprovision \
 	prov_provisioner_pb_adv_reprovision
+
+conf=prj_mesh1d1_conf
+overlay=overlay_psa_conf
+RunTest mesh_prov_pb_adv_repr_psa \
+	prov_device_pb_adv_reprovision \
+	prov_provisioner_pb_adv_reprovision