Skip to content

Commit e572e3a

Browse files
tomi-fontnordicjm
authored andcommitted
[nrf fromtree] secure_storage: enable CONFIG_ENTROPY_GENERATOR in samples/tests
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 <[email protected]> (cherry picked from commit 25ad578) Signed-off-by: Tomi Fontanilles <[email protected]>
1 parent 7ea8719 commit e572e3a

File tree

7 files changed

+8
-8
lines changed

7 files changed

+8
-8
lines changed

samples/psa/its/overlay-entropy_driver.conf

Lines changed: 0 additions & 3 deletions
This file was deleted.

samples/psa/its/prj.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22

33
CONFIG_LOG=y
44
CONFIG_LOG_DEFAULT_LEVEL=3
5+
6+
CONFIG_ENTROPY_GENERATOR=y

samples/psa/its/sample.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tests:
1919
sample.psa.its.secure_storage.entropy_driver:
2020
filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
2121
and CONFIG_ENTROPY_HAS_DRIVER
22-
extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-entropy_driver.conf
22+
extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf
2323
tags:
2424
- drivers.entropy
2525
- settings

samples/psa/persistent_key/overlay-entropy_driver.conf

Lines changed: 0 additions & 3 deletions
This file was deleted.

samples/psa/persistent_key/prj.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@ CONFIG_LOG=y
44
CONFIG_LOG_DEFAULT_LEVEL=3
55
CONFIG_ASSERT=y
66

7+
CONFIG_ENTROPY_GENERATOR=y
8+
79
CONFIG_PSA_WANT_KEY_TYPE_AES=y
810
CONFIG_PSA_WANT_ALG_CTR=y

samples/psa/persistent_key/sample.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ tests:
1919
sample.psa.persistent_key.secure_storage.entropy_driver:
2020
filter: CONFIG_SECURE_STORAGE and not CONFIG_SECURE_STORAGE_ITS_STORE_IMPLEMENTATION_NONE
2121
and CONFIG_ENTROPY_HAS_DRIVER
22-
extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf;overlay-entropy_driver.conf
22+
extra_args: EXTRA_CONF_FILE=overlay-secure_storage.conf
2323
tags:
2424
- drivers.entropy
2525
- settings
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
CONFIG_TFM_PROFILE_TYPE_NOT_SET=y
2+
3+
CONFIG_ENTROPY_GENERATOR=y

0 commit comments

Comments
 (0)