Skip to content

Commit cf10244

Browse files
committed
nrf_security: Don't use PSA dynamic key store Kconfig
This makes sure that the MBEDTLS_PSA_KEY_STORE_DYNAMIC is never forwarded to the build. It also makes the help text more descriptive. Signed-off-by: Georgios Vasilakis <georgios.vasilakis@nordicsemi.no>
1 parent 4ba2a69 commit cf10244

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

subsys/nrf_security/Kconfig.psa

+5
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ config MBEDTLS_PSA_KEY_STORE_DYNAMIC
8282
This option is incompatible with nrf_security when builtin keys are being used.
8383
Since the builtin keys are considered an integral part of nrf_security this option
8484
should not be enabled.
85+
This option is not forwarded to the header files of nrf_security and it is kept
86+
here only for visibility. The PSA key store design defines the hydrid key store
87+
implicitely when both this option and the option regarding the static key slots
88+
are disabled so it is valuable in the build to see that this is disabled.
89+
8590

8691
config MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE
8792
int "PSA static key slot buffer size in bytes"

subsys/nrf_security/cmake/psa_crypto_config.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -465,7 +465,6 @@ kconfig_check_and_set_base_to_one(MBEDTLS_PSA_CRYPTO_DRIVERS)
465465
kconfig_check_and_set_base_int(MBEDTLS_PSA_KEY_SLOT_COUNT)
466466
kconfig_check_and_set_base_to_one(MBEDTLS_PSA_STATIC_KEY_SLOTS)
467467
kconfig_check_and_set_base_int(MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE)
468-
kconfig_check_and_set_base_to_one(MBEDTLS_PSA_KEY_STORE_DYNAMIC)
469468

470469
# Generate the PSA config file (default nrf-psa-crypto-config.h)
471470
configure_file(${NRF_SECURITY_ROOT}/configs/psa_crypto_config.h.template

subsys/nrf_security/configs/psa_crypto_config.h.template

-1
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,6 @@
460460
#cmakedefine MBEDTLS_PSA_KEY_SLOT_COUNT @MBEDTLS_PSA_KEY_SLOT_COUNT@
461461
#cmakedefine MBEDTLS_PSA_STATIC_KEY_SLOTS @MBEDTLS_PSA_STATIC_KEY_SLOTS@
462462
#cmakedefine MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE @MBEDTLS_PSA_STATIC_KEY_SLOT_BUFFER_SIZE@
463-
#cmakedefine MBEDTLS_PSA_KEY_STORE_DYNAMIC @MBEDTLS_PSA_KEY_STORE_DYNAMIC@
464463

465464
#include <oberon_check_unsupported.h>
466465

0 commit comments

Comments
 (0)