nrf_security: Resolve conflict with upstream Kconfig symbol

Upstream Zephyr defined MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG as a choice symbol, which does not play well with default y (no effect, compliance warning). Hence, try to circumvent this by defining a custom hidden symbol, which implies MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG (should work with both choice and standard bool symbols). Signed-off-by: Robert Lubos <[email protected]>
nrfconnect · May 16, 2024 · 0f404fd · 0f404fd
1 parent f475937
commit 0f404fd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/subsys/nrf_security/Kconfig.legacy b/subsys/nrf_security/Kconfig.legacy
@@ -343,9 +343,10 @@ config MBEDTLS_HMAC_DRBG_C
 	  This setting will enable HMAC_DRBG APIs in mbed TLS.
 	  Corresponds to MBEDTLS_HMAC_DRBG_C setting in mbed TLS config file.
 
-config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
+config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_HIDDEN
 	bool
 	default y
+	imply MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
 
 config MBEDTLS_ENTROPY_C
 	bool

diff --git a/subsys/nrf_security/Kconfig.psa b/subsys/nrf_security/Kconfig.psa
@@ -19,9 +19,10 @@ config MBEDTLS_PSA_CRYPTO_KEY_ID_ENCODES_OWNER
 
 osource "modules/mbedtls/Kconfig.psa"
 
-config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
+config MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG_HIDDEN
 	bool
 	default y
+	imply MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG
 
 rsource "src/core/Kconfig"