[nrf fromlist] secure_storage: enable CONFIG_ENTROPY_GENERATOR in samples/tests

tomi-font · tomi-font · commit 5ec8bc76a31a · 2025-03-03T17:36:10.000+02:00
Explicitly enable CONFIG_ENTROPY_GENERATOR instead of relying on the
build system's defaults.

This:
- Makes sure the filtering works properly between entropy_driver and
entropy_not_secure test scenarios for the samples.
- Helps with TF-M builds in certain scenarios where key generation (via
`psa_generate_key()`) would fail due to the RNG functionality being
disabled.

Signed-off-by: Tomi Fontanilles &lt;tomi.fontanilles@nordicsemi.no&gt;

Upstream PR #: 85735

(cherry picked from commit 80a290ea218a6deaa2faa8d421f39029fcf27a4a)
Signed-off-by: Tomi Fontanilles &lt;tomi.fontanilles@nordicsemi.no&gt;
diff --git a/samples/psa/its/overlay-entropy_driver.conf b/samples/psa/its/overlay-entropy_driver.conf
diff --git a/samples/psa/its/prj.conf b/samples/psa/its/prj.conf
@@ -2,3 +2,5 @@
 
 CONFIG_LOG=y
 CONFIG_LOG_DEFAULT_LEVEL=3
+
+CONFIG_ENTROPY_GENERATOR=y
diff --git a/samples/psa/its/sample.yaml b/samples/psa/its/sample.yaml
@@ -19,7 +19,7 @@ tests:
   sample.psa.its.secure_storage.entropy_driver:
     filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
             and CONFIG_ENTROPY_HAS_DRIVER
-    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-entropy_driver.conf
+    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf
     tags:
       - drivers.entropy
       - settings
diff --git a/samples/psa/persistent_key/overlay-entropy_driver.conf b/samples/psa/persistent_key/overlay-entropy_driver.conf
diff --git a/samples/psa/persistent_key/prj.conf b/samples/psa/persistent_key/prj.conf
@@ -4,5 +4,7 @@ CONFIG_LOG=y
 CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_ASSERT=y
 
+CONFIG_ENTROPY_GENERATOR=y
+
 CONFIG_PSA_WANT_KEY_TYPE_AES=y
 CONFIG_PSA_WANT_ALG_CTR=y
diff --git a/samples/psa/persistent_key/sample.yaml b/samples/psa/persistent_key/sample.yaml
@@ -19,7 +19,7 @@ tests:
   sample.psa.persistent_key.secure_storage.entropy_driver:
     filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
             and CONFIG_ENTROPY_HAS_DRIVER
-    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-entropy_driver.conf
+    extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf
     tags:
       - drivers.entropy
       - settings
diff --git a/tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf b/tests/subsys/secure_storage/psa/crypto/overlay-tfm.conf
@@ -1 +1,3 @@
 CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
+
+CONFIG_ENTROPY_GENERATOR=y

Original file line number	Diff line number	Diff line change
`@@ -1 +1,3 @@`
`1`	`1`	`CONFIG_TFM_PROFILE_TYPE_NOT_SET=y`
	`2`	`+`
	`3`	`+CONFIG_ENTROPY_GENERATOR=y`