mesh: tests: Deprecate usage of TinyCrypt in tests

frkv · anangl · commit d2fe7091d185 · 2025-02-05T16:26:18.000+01:00
-Changing from using CONFIG_BT_MESH_USES_TINYCRYPT to
 CONFIG_BT_MESH_USES_MBEDTLS_PSA for mesh tests because TinyCrypt is
 deprecated
-Adding boards/native_sim.conf for mesh tests to enable usage of
 builtin Mbed TLS (nrf_security not supported):
 -light_ctrl
 -light_hue
 -scheduler_model/action_planning
 -scheduler_model/message_validity
 -scheduler_model/timing

Signed-off-by: Frank Audun Kvamtrø &lt;frank.kvamtro@nordicsemi.no&gt;
diff --git a/tests/subsys/bluetooth/mesh/light_ctrl/CMakeLists.txt b/tests/subsys/bluetooth/mesh/light_ctrl/CMakeLists.txt
@@ -60,7 +60,7 @@ target_compile_options(app
   -DCONFIG_BT_MESH_LIGHT_CTRL_AMB_LIGHT_LEVEL_TIMEOUT=20
   -DCONFIG_BT_MESH_SENSOR_CHANNELS_MAX=1
   -DCONFIG_BT_MESH_SENSOR_CHANNEL_ENCODED_SIZE_MAX=4
-  -DCONFIG_BT_MESH_USES_TINYCRYPT
+  -DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1
 )
 
 zephyr_linker_sources(SECTIONS ${ZEPHYR_NRF_MODULE_DIR}/subsys/bluetooth/mesh/sensor_types.ld)
diff --git a/tests/subsys/bluetooth/mesh/light_ctrl/boards/native_sim.conf b/tests/subsys/bluetooth/mesh/light_ctrl/boards/native_sim.conf
@@ -0,0 +1,5 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_MBEDTLS=y
+CONFIG_MBEDTLS_BUILTIN=y
+CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
diff --git a/tests/subsys/bluetooth/mesh/light_hue/CMakeLists.txt b/tests/subsys/bluetooth/mesh/light_hue/CMakeLists.txt
@@ -28,7 +28,7 @@ target_compile_options(app
   -DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_BASE=3000
   -DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_PER_HOP=50
   -DCONFIG_BT_LOG_LEVEL=0
-  -DCONFIG_BT_MESH_USES_TINYCRYPT
+  -DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1
 )
 
 zephyr_ld_options(
diff --git a/tests/subsys/bluetooth/mesh/light_hue/boards/native_sim.conf b/tests/subsys/bluetooth/mesh/light_hue/boards/native_sim.conf
@@ -0,0 +1,5 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_MBEDTLS=y
+CONFIG_MBEDTLS_BUILTIN=y
+CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
diff --git a/tests/subsys/bluetooth/mesh/scheduler_model/action_planning/CMakeLists.txt b/tests/subsys/bluetooth/mesh/scheduler_model/action_planning/CMakeLists.txt
@@ -33,7 +33,7 @@ target_compile_options(app
   -DCONFIG_BT_MESH_MODEL_LOG_LEVEL=0
   -DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_BASE=0
   -DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_PER_HOP=0
-  -DCONFIG_BT_MESH_USES_TINYCRYPT
+  -DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1
   )
 
 zephyr_ld_options(
diff --git a/tests/subsys/bluetooth/mesh/scheduler_model/action_planning/boards/native_sim.conf b/tests/subsys/bluetooth/mesh/scheduler_model/action_planning/boards/native_sim.conf
@@ -0,0 +1,5 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_MBEDTLS=y
+CONFIG_MBEDTLS_BUILTIN=y
+CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
diff --git a/tests/subsys/bluetooth/mesh/scheduler_model/message_validity/CMakeLists.txt b/tests/subsys/bluetooth/mesh/scheduler_model/message_validity/CMakeLists.txt
@@ -34,7 +34,7 @@ target_compile_options(app
   -DCONFIG_BT_MESH_MODEL_LOG_LEVEL=0
   -DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_BASE=0
   -DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_PER_HOP=0
-  -DCONFIG_BT_MESH_USES_TINYCRYPT
+  -DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1
   )
 
 zephyr_ld_options(
diff --git a/tests/subsys/bluetooth/mesh/scheduler_model/message_validity/boards/native_sim.conf b/tests/subsys/bluetooth/mesh/scheduler_model/message_validity/boards/native_sim.conf
@@ -0,0 +1,5 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_MBEDTLS=y
+CONFIG_MBEDTLS_BUILTIN=y
+CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
diff --git a/tests/subsys/bluetooth/mesh/scheduler_model/timing/CMakeLists.txt b/tests/subsys/bluetooth/mesh/scheduler_model/timing/CMakeLists.txt
@@ -29,7 +29,7 @@ target_compile_options(app
   -DCONFIG_BT_MESH_MODEL_GROUP_COUNT=5
   -DCONFIG_BT_LOG_LEVEL=0
   -DCONFIG_BT_MESH_SCHEDULER_SRV=1
-  -DCONFIG_BT_MESH_USES_TINYCRYPT
+  -DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1
   )
 
 zephyr_ld_options(
diff --git a/tests/subsys/bluetooth/mesh/scheduler_model/timing/boards/native_sim.conf b/tests/subsys/bluetooth/mesh/scheduler_model/timing/boards/native_sim.conf
@@ -0,0 +1,5 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_MBEDTLS=y
+CONFIG_MBEDTLS_BUILTIN=y
+CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
diff --git a/tests/subsys/bluetooth/mesh/sensor_subsys/CMakeLists.txt b/tests/subsys/bluetooth/mesh/sensor_subsys/CMakeLists.txt
@@ -28,7 +28,7 @@ target_compile_options(app
   -DCONFIG_BT_MESH_SENSOR_CHANNELS_MAX=5
   -DCONFIG_BT_MESH_SENSOR_CHANNEL_ENCODED_SIZE_MAX=4
   -DCONFIG_BT_LOG_LEVEL=0
-  -DCONFIG_BT_MESH_USES_TINYCRYPT
+  -DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1
   )
 
 zephyr_linker_sources(SECTIONS sensor_types.ld)
diff --git a/tests/subsys/bluetooth/mesh/sensor_subsys/boards/native_sim.conf b/tests/subsys/bluetooth/mesh/sensor_subsys/boards/native_sim.conf
@@ -0,0 +1,5 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_MBEDTLS=y
+CONFIG_MBEDTLS_BUILTIN=y
+CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
diff --git a/tests/subsys/bluetooth/mesh/silvair_enocean_model/CMakeLists.txt b/tests/subsys/bluetooth/mesh/silvair_enocean_model/CMakeLists.txt
@@ -29,7 +29,7 @@ target_compile_options(app
     -DCONFIG_BT_MESH_SILVAIR_ENOCEAN_AUTO_COMMISSION=1
     -DCONFIG_BT_MESH_MODEL_KEY_COUNT=1
     -DCONFIG_BT_MESH_MODEL_GROUP_COUNT=1
-    -DCONFIG_BT_MESH_USES_TINYCRYPT
+    -DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1
     )
 
 zephyr_ld_options(
diff --git a/tests/subsys/bluetooth/mesh/silvair_enocean_model/boards/native_sim.conf b/tests/subsys/bluetooth/mesh/silvair_enocean_model/boards/native_sim.conf
@@ -0,0 +1,5 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_MBEDTLS=y
+CONFIG_MBEDTLS_BUILTIN=y
+CONFIG_BT_MESH_USES_MBEDTLS_PSA=y
diff --git a/tests/subsys/bluetooth/mesh/time_model/CMakeLists.txt b/tests/subsys/bluetooth/mesh/time_model/CMakeLists.txt
@@ -31,7 +31,7 @@ target_compile_options(app
   -DCONFIG_BT_MESH_TIME_SRV=1
   -DCONFIG_BT_MESH_TIME_SRV_CLOCK_ACCURACY=500
   -DCONFIG_BT_MESH_TIME_MESH_HOP_UNCERTAINTY=30
-  -DCONFIG_BT_MESH_USES_TINYCRYPT
+  -DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1
   )
 
 zephyr_ld_options(
diff --git a/tests/subsys/bluetooth/mesh/time_model/boards/native_sim.conf b/tests/subsys/bluetooth/mesh/time_model/boards/native_sim.conf
@@ -0,0 +1,5 @@
+# nrf_security only supports Cortex-M via PSA crypto libraries.
+# Enforcing usage of built-in Mbed TLS for native simulator.
+CONFIG_MBEDTLS=y
+CONFIG_MBEDTLS_BUILTIN=y
+CONFIG_BT_MESH_USES_MBEDTLS_PSA=y

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ target_compile_options(app`
`60`	`60`	`-DCONFIG_BT_MESH_LIGHT_CTRL_AMB_LIGHT_LEVEL_TIMEOUT=20`
`61`	`61`	`-DCONFIG_BT_MESH_SENSOR_CHANNELS_MAX=1`
`62`	`62`	`-DCONFIG_BT_MESH_SENSOR_CHANNEL_ENCODED_SIZE_MAX=4`
`63`		`- -DCONFIG_BT_MESH_USES_TINYCRYPT`
	`63`	`+ -DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1`
`64`	`64`	`)`
`65`	`65`
`66`	`66`	`zephyr_linker_sources(SECTIONS ${ZEPHYR_NRF_MODULE_DIR}/subsys/bluetooth/mesh/sensor_types.ld)`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ target_compile_options(app`
`28`	`28`	`-DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_BASE=3000`
`29`	`29`	`-DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_PER_HOP=50`
`30`	`30`	`-DCONFIG_BT_LOG_LEVEL=0`
`31`		`- -DCONFIG_BT_MESH_USES_TINYCRYPT`
	`31`	`+ -DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`zephyr_ld_options(`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ target_compile_options(app`
`33`	`33`	`-DCONFIG_BT_MESH_MODEL_LOG_LEVEL=0`
`34`	`34`	`-DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_BASE=0`
`35`	`35`	`-DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_PER_HOP=0`
`36`		`- -DCONFIG_BT_MESH_USES_TINYCRYPT`
	`36`	`+ -DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1`
`37`	`37`	`)`
`38`	`38`
`39`	`39`	`zephyr_ld_options(`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ target_compile_options(app`
`34`	`34`	`-DCONFIG_BT_MESH_MODEL_LOG_LEVEL=0`
`35`	`35`	`-DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_BASE=0`
`36`	`36`	`-DCONFIG_BT_MESH_MOD_ACKD_TIMEOUT_PER_HOP=0`
`37`		`- -DCONFIG_BT_MESH_USES_TINYCRYPT`
	`37`	`+ -DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`zephyr_ld_options(`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ target_compile_options(app`
`29`	`29`	`-DCONFIG_BT_MESH_MODEL_GROUP_COUNT=5`
`30`	`30`	`-DCONFIG_BT_LOG_LEVEL=0`
`31`	`31`	`-DCONFIG_BT_MESH_SCHEDULER_SRV=1`
`32`		`- -DCONFIG_BT_MESH_USES_TINYCRYPT`
	`32`	`+ -DCONFIG_BT_MESH_USES_MBEDTLS_PSA=1`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`zephyr_ld_options(`