From 50c03e9bbe68db9944704e380802be44d45cfc42 Mon Sep 17 00:00:00 2001 From: Tomi Fontanilles Date: Wed, 10 Jul 2024 14:45:16 +0300 Subject: [PATCH] modules: mbedtls: fix MBEDTLS_PSA_P256M_DRIVER_RAW Kconfig option Make it depend on MBEDTLS_PSA_P256M_DRIVER_ENABLED instead of selecting it. This fixes the build of tests/crypto/secp256r1/crypto.secp256r1.p256-m_raw on filtered-out platforms since PR #75441 (83cd9f5a01664e82d3a0cb062b356b9a4de3e755). Signed-off-by: Tomi Fontanilles --- modules/mbedtls/Kconfig.tls-generic | 12 +++++------- tests/crypto/secp256r1/mbedtls.conf | 4 +--- tests/crypto/secp256r1/p256-m_raw.conf | 7 +++---- tests/crypto/secp256r1/prj.conf | 2 ++ tests/crypto/secp256r1/tinycrypt.conf | 2 -- 5 files changed, 11 insertions(+), 16 deletions(-) diff --git a/modules/mbedtls/Kconfig.tls-generic b/modules/mbedtls/Kconfig.tls-generic index fc05724a562..c27f0540f29 100644 --- a/modules/mbedtls/Kconfig.tls-generic +++ b/modules/mbedtls/Kconfig.tls-generic @@ -512,17 +512,15 @@ config MBEDTLS_PSA_P256M_DRIVER_ENABLED imply PSA_WANT_ALG_SHA_256 help Enable support for the optimized sofware implementation of the secp256r1 - curve through the standard PSA API interface. + curve through the standard PSA API. config MBEDTLS_PSA_P256M_DRIVER_RAW bool "Access p256-m driver directly (without PSA interface)" - select MBEDTLS_PSA_P256M_DRIVER_ENABLED + depends on MBEDTLS_PSA_P256M_DRIVER_ENABLED help - Allow access to p256-m driver directly without using the PSA interface. - Warning: usage of this kconfig is prohibited in Zephyr's code base. Users - can make optionally enable it in case very memory constrained - devices, but please be aware that the p256-m interface is - absolutely not guaranted to remain stable over time. + Allow direct access to the p256-m driver interface. + Warning: Usage of this Kconfig option is prohibited in Zephyr's codebase. + Users can enable it in case of very memory-constrained devices, but be aware that the p256-m interface is absolutely not guaranted to remain stable over time. config MBEDTLS_SSL_DTLS_CONNECTION_ID bool "DTLS Connection ID extension" diff --git a/tests/crypto/secp256r1/mbedtls.conf b/tests/crypto/secp256r1/mbedtls.conf index 79af8d17368..bef1ccdd6e8 100644 --- a/tests/crypto/secp256r1/mbedtls.conf +++ b/tests/crypto/secp256r1/mbedtls.conf @@ -1,4 +1,5 @@ CONFIG_MBEDTLS=y +CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG=y CONFIG_MBEDTLS_PSA_CRYPTO_C=y CONFIG_MBEDTLS_PSA_P256M_DRIVER_ENABLED=y @@ -10,6 +11,3 @@ CONFIG_PSA_WANT_KEY_TYPE_ECC_KEY_PAIR_DERIVE=y CONFIG_PSA_WANT_ECC_SECP_R1_256=y CONFIG_PSA_WANT_ALG_ECDH=y CONFIG_PSA_WANT_ALG_ECDSA=y - -CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG=y -CONFIG_ENTROPY_GENERATOR=y diff --git a/tests/crypto/secp256r1/p256-m_raw.conf b/tests/crypto/secp256r1/p256-m_raw.conf index d009a9dccc7..801a31df91a 100644 --- a/tests/crypto/secp256r1/p256-m_raw.conf +++ b/tests/crypto/secp256r1/p256-m_raw.conf @@ -1,6 +1,5 @@ CONFIG_MBEDTLS=y -CONFIG_MBEDTLS_PSA_CRYPTO_C=y -CONFIG_MBEDTLS_PSA_P256M_DRIVER_RAW=y - CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG=y -CONFIG_ENTROPY_GENERATOR=y +CONFIG_MBEDTLS_PSA_CRYPTO_C=y +CONFIG_MBEDTLS_PSA_P256M_DRIVER_ENABLED=y +CONFIG_MBEDTLS_PSA_P256M_DRIVER_RAW=y diff --git a/tests/crypto/secp256r1/prj.conf b/tests/crypto/secp256r1/prj.conf index 2c29f4bb895..887c4ea169d 100644 --- a/tests/crypto/secp256r1/prj.conf +++ b/tests/crypto/secp256r1/prj.conf @@ -1,2 +1,4 @@ CONFIG_ZTEST_STACK_SIZE=8192 CONFIG_ZTEST=y + +CONFIG_ENTROPY_GENERATOR=y diff --git a/tests/crypto/secp256r1/tinycrypt.conf b/tests/crypto/secp256r1/tinycrypt.conf index 1992ea96414..1686bae35c1 100644 --- a/tests/crypto/secp256r1/tinycrypt.conf +++ b/tests/crypto/secp256r1/tinycrypt.conf @@ -1,5 +1,3 @@ CONFIG_TINYCRYPT=y CONFIG_TINYCRYPT_ECC_DH=y CONFIG_TINYCRYPT_ECC_DSA=y - -CONFIG_ENTROPY_GENERATOR=y