tests: bt: enable entropy sources where missing

valeriosetti · cvinayak · commit 69395c1002b2 · 2024-11-14T10:42:28.000+01:00
Moving from TinyCrypt to PSA Crypto API caused an entropy source
to be always required, so this commit adds it in tests where
necessary.

Signed-off-by: Valerio Setti &lt;vsetti@baylibre.com&gt;
diff --git a/samples/bluetooth/bap_broadcast_sink/boards/nrf5340bsim_nrf5340_cpuapp.conf b/samples/bluetooth/bap_broadcast_sink/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/bap_broadcast_sink/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_broadcast_sink/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -1,3 +1,4 @@
 # Use USB Audio as audio sink
 CONFIG_USE_USB_AUDIO_OUTPUT=y
 CONFIG_USB_DEVICE_PRODUCT="USB Broadcast Sink"
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/bap_broadcast_source/boards/nrf5340bsim_nrf5340_cpuapp.conf b/samples/bluetooth/bap_broadcast_source/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/bap_broadcast_source/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_broadcast_source/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -1,3 +1,4 @@
 # Use USB Audio as audio source
 CONFIG_USE_USB_AUDIO_INPUT=y
 CONFIG_USB_DEVICE_PRODUCT="Zephyr Broadcast Source"
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/bap_unicast_client/boards/native_sim.conf b/samples/bluetooth/bap_unicast_client/boards/native_sim.conf
@@ -8,3 +8,5 @@ CONFIG_FPU=y
 # than every 10 ms as each PDU for some reason takes 2 ticks to process.
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
 CONFIG_NATIVE_POSIX_SLOWDOWN_TO_REAL_TIME=y
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/bap_unicast_client/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_client/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -11,3 +11,5 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 
 CONFIG_BT_SEND_ECC_EMULATION=y
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/bap_unicast_server/boards/nrf5340bsim_nrf5340_cpuapp.conf b/samples/bluetooth/bap_unicast_server/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -8,3 +8,5 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 
 CONFIG_BT_SEND_ECC_EMULATION=y
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/beacon/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/beacon/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -0,0 +1,13 @@
+# We need a random number generator to properly initialize the PSA Crypto core
+# implemented by Mbed TLS. The proper thing to do in this platform would be
+# to enable ENTROPY_GENERATOR, but this is not supported right now for the
+# following reasons:
+# - at device-tree level (nrf54l15_cpuapp.dtsi) the only RNG source available
+#   is "zephyr,psa-crypto-rng" which means that TF-M is required in order for
+#   this to work. Unfortunately TF-M is still not supported for this platform, yet.
+# - cpuapp does not have a direct access to the RNG without TF-M, so there's
+#   no other way it can make use of it as of now.
+#
+# Since both options are not viable, we fall back to the test random generator
+# until further support is added to the platform.
+CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/samples/bluetooth/cap_acceptor/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/cap_acceptor/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -4,3 +4,4 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 
 CONFIG_BT_SEND_ECC_EMULATION=y
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/cap_acceptor/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/cap_acceptor/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -4,3 +4,4 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 
 CONFIG_BT_SEND_ECC_EMULATION=y
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/cap_initiator/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/samples/bluetooth/cap_initiator/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -4,3 +4,4 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 
 CONFIG_BT_SEND_ECC_EMULATION=y
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/cap_initiator/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/cap_initiator/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -4,3 +4,4 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 
 CONFIG_BT_SEND_ECC_EMULATION=y
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/central_hr/boards/nrf5340bsim_nrf5340_cpuapp.conf b/samples/bluetooth/central_hr/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -1,3 +1,4 @@
 # Set same the ACL RX buffer size as in hci_ipc on netcore so that
 # HCI Controller to Host Flowcontrol is supported.
 CONFIG_BT_BUF_ACL_RX_SIZE=255
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/central_hr/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/central_hr/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/central_ht/boards/frdm_rw612.conf b/samples/bluetooth/central_ht/boards/frdm_rw612.conf
@@ -1 +1,2 @@
 CONFIG_PM=y
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/central_ht/boards/rd_rw612_bga.conf b/samples/bluetooth/central_ht/boards/rd_rw612_bga.conf
@@ -1 +1,2 @@
 CONFIG_PM=y
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/direction_finding_central/boards/nrf5340dk_nrf5340_cpuapp.conf b/samples/bluetooth/direction_finding_central/boards/nrf5340dk_nrf5340_cpuapp.conf
@@ -0,0 +1 @@
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/hap_ha/boards/native_sim.conf b/samples/bluetooth/hap_ha/boards/native_sim.conf
@@ -5,3 +5,5 @@ CONFIG_BT_SEND_ECC_EMULATION=y
 # than every 10 ms as each PDU for some reason takes 2 ticks to process.
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
 CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=y
+
+CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/samples/bluetooth/iso_connected_benchmark/prj.conf b/samples/bluetooth/iso_connected_benchmark/prj.conf
@@ -15,3 +15,5 @@ CONFIG_MAIN_STACK_SIZE=2048
 CONFIG_LOG=y
 CONFIG_CBPRINTF_FP_SUPPORT=y
 CONFIG_LOG_BUFFER_SIZE=2048
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/peripheral_hr/boards/nrf5340bsim_nrf5340_cpuapp.conf b/samples/bluetooth/peripheral_hr/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -1,3 +1,4 @@
 # Set same the ACL RX buffer size as in hci_ipc on netcore so that
 # HCI Controller to Host Flowcontrol is supported.
 CONFIG_BT_BUF_ACL_RX_SIZE=255
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/peripheral_hr/boards/nrf54l15dk_nrf54l15_cpuapp.conf b/samples/bluetooth/peripheral_hr/boards/nrf54l15dk_nrf54l15_cpuapp.conf
@@ -0,0 +1,13 @@
+# We need a random number generator to properly initialize the PSA Crypto core
+# implemented by Mbed TLS. The proper thing to do in this platform would be
+# to enable ENTROPY_GENERATOR, but this is not supported right now for the
+# following reasons:
+# - at device-tree level (nrf54l15_cpuapp.dtsi) the only RNG source available
+#   is "zephyr,psa-crypto-rng" which means that TF-M is required in order for
+#   this to work. Unfortunately TF-M is still not supported for this platform, yet.
+# - cpuapp does not have a direct access to the RNG without TF-M, so there's
+#   no other way it can make use of it as of now.
+#
+# Since both options are not viable, we fall back to the test random generator
+# until further support is added to the platform.
+CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/samples/bluetooth/peripheral_ht/boards/frdm_rw612.conf b/samples/bluetooth/peripheral_ht/boards/frdm_rw612.conf
@@ -1 +1,2 @@
 CONFIG_PM=y
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/peripheral_ht/boards/mimxrt1020_evk_mimxrt1021.conf b/samples/bluetooth/peripheral_ht/boards/mimxrt1020_evk_mimxrt1021.conf
@@ -0,0 +1 @@
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/peripheral_ht/boards/rd_rw612_bga.conf b/samples/bluetooth/peripheral_ht/boards/rd_rw612_bga.conf
@@ -1 +1,2 @@
 CONFIG_PM=y
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/st_ble_sensor/prj.conf b/samples/bluetooth/st_ble_sensor/prj.conf
@@ -4,3 +4,4 @@ CONFIG_BT_DEVICE_NAME="P2PSRV1"
 CONFIG_BT_GATT_CLIENT=y
 CONFIG_LOG=y
 CONFIG_LOG_BUFFER_SIZE=2048
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/tmap_bmr/boards/native_sim.conf b/samples/bluetooth/tmap_bmr/boards/native_sim.conf
@@ -8,3 +8,5 @@ CONFIG_FPU=y
 # than every 10 ms as each PDU for some reason takes 2 ticks to process.
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
 CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=y
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/tmap_bms/boards/native_sim.conf b/samples/bluetooth/tmap_bms/boards/native_sim.conf
@@ -8,3 +8,5 @@ CONFIG_FPU=y
 # than every 10 ms as each PDU for some reason takes 2 ticks to process.
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
 CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=y
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/tmap_central/boards/native_sim.conf b/samples/bluetooth/tmap_central/boards/native_sim.conf
@@ -8,3 +8,5 @@ CONFIG_FPU=y
 # than every 10 ms as each PDU for some reason takes 2 ticks to process.
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
 CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=y
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/bluetooth/tmap_peripheral/boards/native_sim.conf b/samples/bluetooth/tmap_peripheral/boards/native_sim.conf
@@ -8,3 +8,5 @@ CONFIG_FPU=y
 # than every 10 ms as each PDU for some reason takes 2 ticks to process.
 CONFIG_SYS_CLOCK_TICKS_PER_SEC=1000
 CONFIG_NATIVE_SIM_SLOWDOWN_TO_REAL_TIME=y
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/boards/st/power_mgmt/stm32wb_ble/prj.conf b/samples/boards/st/power_mgmt/stm32wb_ble/prj.conf
@@ -2,3 +2,4 @@ CONFIG_BT=y
 CONFIG_BT_DEVICE_NAME="Test beacon"
 CONFIG_POWEROFF=y
 CONFIG_PM=y
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/subsys/logging/ble_backend/prj.conf b/samples/subsys/logging/ble_backend/prj.conf
@@ -8,3 +8,5 @@ CONFIG_LOG_PROCESS_THREAD_STACK_SIZE=2048
 # Uncomment to use the maximum buffer size
 # CONFIG_BT_L2CAP_TX_MTU=600
 # CONFIG_BT_BUF_ACL_RX_SIZE=600
+
+CONFIG_TEST_RANDOM_GENERATOR=y
diff --git a/tests/bluetooth/shell/audio.conf b/tests/bluetooth/shell/audio.conf
@@ -241,3 +241,6 @@ CONFIG_BT_CTLR_ADV_ISO_STREAM_MAX=4
 # Match the number of unicast streams supported in BAP
 CONFIG_BT_CTLR_ISOAL_SOURCES=2
 CONFIG_BT_CTLR_ISOAL_SINKS=2
+
+# Enable entropy source for Mbed TLS's PSA Crypto core
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/tests/bluetooth/tester/boards/frdm_rw612.conf b/tests/bluetooth/tester/boards/frdm_rw612.conf
@@ -1,5 +1,6 @@
 CONFIG_BT_MAX_CONN=16
 CONFIG_BT_BUF_ACL_RX_COUNT=17
+CONFIG_ENTROPY_GENERATOR=y
 
 # debug options
 # CONFIG_UART_CONSOLE=y
diff --git a/tests/bluetooth/tester/boards/native_sim.conf b/tests/bluetooth/tester/boards/native_sim.conf
@@ -1,3 +1,4 @@
 CONFIG_UART_PIPE=n
 CONFIG_SERIAL=y
 CONFIG_UART_NATIVE_POSIX=y
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf b/tests/bluetooth/tester/boards/nrf5340_audio_dk_nrf5340_cpuapp.conf
@@ -23,3 +23,5 @@ CONFIG_BTTESTER_LOG_LEVEL_DBG=y
 CONFIG_UART_INTERRUPT_DRIVEN=y
 
 CONFIG_BT_SEND_ECC_EMULATION=y
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/tests/bluetooth/tester/boards/rd_rw612_bga.conf b/tests/bluetooth/tester/boards/rd_rw612_bga.conf
@@ -1,5 +1,6 @@
 CONFIG_BT_MAX_CONN=16
 CONFIG_BT_BUF_ACL_RX_COUNT=17
+CONFIG_ENTROPY_GENERATOR=y
 
 # debug options
 # CONFIG_UART_CONSOLE=y
diff --git a/tests/bsim/bluetooth/audio/prj.conf b/tests/bsim/bluetooth/audio/prj.conf
@@ -209,3 +209,5 @@ CONFIG_BT_GMAP_LOG_LEVEL_DBG=y
 
 # LOGGING
 CONFIG_LOG_MODE_IMMEDIATE=y
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/compile.sh b/tests/bsim/bluetooth/audio_samples/bap_broadcast_sink/compile.sh
@@ -10,9 +10,13 @@ set -ue
 source ${ZEPHYR_BASE}/tests/bsim/compile.source
 
 if [ "${BOARD_TS}" == "nrf5340bsim_nrf5340_cpuapp" ]; then
-  app=samples/bluetooth/bap_broadcast_source sysbuild=1 compile
+  app=samples/bluetooth/bap_broadcast_source sysbuild=1 \
+  conf_overlay=${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_source/boards/${BOARD_TS}.conf \
+  exe_name=bs_${BOARD_TS}_${app}_prj_conf \
+  compile
   app=tests/bsim/bluetooth/audio_samples/bap_broadcast_sink sysbuild=1 \
     conf_file=${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/prj.conf \
+    conf_overlay=${ZEPHYR_BASE}/samples/bluetooth/bap_broadcast_sink/boards/${BOARD_TS}.conf \
     exe_name=bs_${BOARD_TS}_${app}_prj_conf sysbuild=1 compile
 else
   app=samples/bluetooth/bap_broadcast_source conf_overlay=overlay-bt_ll_sw_split.conf \
diff --git a/tests/bsim/bluetooth/audio_samples/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpuapp.conf b/tests/bsim/bluetooth/audio_samples/bap_unicast_client/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -10,3 +10,4 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_CMD_TX_SIZE=255
 
 CONFIG_BT_SEND_ECC_EMULATION=y
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/tests/bsim/bluetooth/ll/bis/prj.conf b/tests/bsim/bluetooth/ll/bis/prj.conf
@@ -24,3 +24,5 @@ CONFIG_BT_CTLR_TEST=y
 
 CONFIG_BT_BUF_ACL_TX_SIZE=251
 CONFIG_BT_BUF_ACL_RX_SIZE=255
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/tests/bsim/bluetooth/ll/cis/overlay-acl_group.conf b/tests/bsim/bluetooth/ll/cis/overlay-acl_group.conf
@@ -4,3 +4,4 @@ CONFIG_BT_MAX_CONN=4
 CONFIG_BT_ISO_MAX_CHAN=4
 CONFIG_BT_CTLR_LLCP_LOCAL_PROC_CTX_BUF_NUM=6
 CONFIG_BT_CTLR_CENTRAL_SPACING=0
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/tests/bsim/bluetooth/ll/conn/prj_split_hci_uart.conf b/tests/bsim/bluetooth/ll/conn/prj_split_hci_uart.conf
@@ -15,3 +15,5 @@ CONFIG_BT_L2CAP_TX_BUF_COUNT=6
 
 CONFIG_BT_HCI=y
 CONFIG_BT_CTLR=n
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/tests/bsim/bluetooth/ll/conn/prj_split_privacy.conf b/tests/bsim/bluetooth/ll/conn/prj_split_privacy.conf
@@ -12,3 +12,4 @@ CONFIG_BT_GATT_CLIENT=y
 CONFIG_BT_L2CAP_DYNAMIC_CHANNEL=y
 CONFIG_BT_DEVICE_NAME="bsim_test_split"
 CONFIG_BT_L2CAP_TX_BUF_COUNT=6
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/tests/bsim/bluetooth/samples/central_hr_peripheral_hr/boards/nrf5340bsim_nrf5340_cpuapp.conf b/tests/bsim/bluetooth/samples/central_hr_peripheral_hr/boards/nrf5340bsim_nrf5340_cpuapp.conf
@@ -1 +1,2 @@
 CONFIG_BT_BUF_ACL_RX_SIZE=255
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/tests/subsys/storage/flash_map/overlay-psa.conf b/tests/subsys/storage/flash_map/overlay-psa.conf
@@ -1,3 +1,5 @@
 CONFIG_FLASH_AREA_CHECK_INTEGRITY_PSA=y
 CONFIG_MBEDTLS=y
 CONFIG_MBEDTLS_PSA_CRYPTO_C=y
+
+CONFIG_TEST_RANDOM_GENERATOR=y

Original file line number	Diff line number	Diff line change
`@@ -4,3 +4,4 @@ CONFIG_BT_BUF_ACL_TX_SIZE=251`
`4`	`4`	`CONFIG_BT_BUF_CMD_TX_SIZE=255`
`5`	`5`
`6`	`6`	`CONFIG_BT_SEND_ECC_EMULATION=y`
	`7`	`+CONFIG_ENTROPY_GENERATOR=y`