Skip to content

Commit 9e7c579

Browse files
committed
nrf_security: remove CONFIG_PSA_ITS_ENCRYPTED
`CONFIG_TFM_ITS_ENCRYPTED` is the one that matters here, and this is only about TF-M. Get rid of this confusing Kconfig option. Signed-off-by: Tomi Fontanilles <[email protected]>
1 parent 2ebd1b3 commit 9e7c579

File tree

4 files changed

+2
-9
lines changed

4 files changed

+2
-9
lines changed

doc/nrf/security/psa_certified_api_overview.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ The following table provides an overview over features in Internal Trusted Stora
217217
* The PSA Crypto API is invoked by other APIs that are available from the NSPE.
218218
For example the PSA Protected Storage API or the PSA Crypto API ``import()`` and ``generate()``.
219219

220-
* Internal Trusted Storage has experimental support for encryption with the :kconfig:option:`CONFIG_PSA_ITS_ENCRYPTED` Kconfig option set.
220+
* Internal Trusted Storage has experimental support for encryption with the :kconfig:option:`CONFIG_TFM_ITS_ENCRYPTED` Kconfig option.
221221

222222
PSA Secure Storage API in Nordic hardware and the |NCS|
223223
=======================================================

modules/trusted-firmware-m/Kconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ config TFM_ITS_ENCRYPTED
227227
depends on !CRACEN_NEED_MULTIPART_WORKAROUNDS
228228
default y if SOC_SERIES_NRF54LX
229229
select PSA_WANT_ALG_CHACHA20_POLY1305 if SOC_SERIES_NRF54LX
230-
select PSA_ITS_ENCRYPTED
231230
select PSA_WANT_GENERATE_RANDOM
232231
help
233232
Enables authenticated encryption for PSA Internal Trusted Storage files

subsys/nrf_security/Kconfig.psa

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,6 @@ config MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE
9898
to set here. The applications need to increase this buffer size in accordance
9999
with the enabled key types and sizes.
100100

101-
config PSA_ITS_ENCRYPTED
102-
bool
103-
depends on MBEDTLS_PSA_CRYPTO_STORAGE_C
104-
help
105-
Enables authenticated encryption for PSA Internal Trusted Storage files
106-
107101
config PSA_CRYPTO_SYS_INIT
108102
bool "Invoke psa_crypto_init during system initialization"
109103
default y

subsys/nrf_security/cmake/config_to_tf-m.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set_property(TARGET zephyr_property_target
2020
PROPERTY TFM_MBEDCRYPTO_PATH ${CMAKE_CURRENT_LIST_DIR}/../tfm
2121
)
2222

23-
if(CONFIG_PSA_ITS_ENCRYPTED)
23+
if(CONFIG_TFM_ITS_ENCRYPTED)
2424
set_property(TARGET zephyr_property_target
2525
APPEND PROPERTY TFM_CMAKE_OPTIONS
2626
-DITS_ENCRYPTION=1

0 commit comments

Comments
 (0)