From 37808d809181fd553800f33555103eacaf64d27a Mon Sep 17 00:00:00 2001 From: Moritz Fischer Date: Wed, 28 Feb 2024 21:27:23 +0000 Subject: [PATCH] modules: mbedtls: Update with PSA dependencies mbedTLS wants matching PSA configuration options for some of the elliptic curve algorithms nowadays. These checks are encoded in mbedTLS's check_config.h header. Signed-off-by: Moritz Fischer --- modules/mbedtls/configs/config-tls-generic.h | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/modules/mbedtls/configs/config-tls-generic.h b/modules/mbedtls/configs/config-tls-generic.h index 7a7294aba892..c65c0f334a2d 100644 --- a/modules/mbedtls/configs/config-tls-generic.h +++ b/modules/mbedtls/configs/config-tls-generic.h @@ -214,54 +214,67 @@ #if defined(CONFIG_MBEDTLS_ECP_DP_SECP192R1_ENABLED) #define MBEDTLS_ECP_DP_SECP192R1_ENABLED +#define PSA_WANT_ECC_SECP_R1_192 1 #endif #if defined(CONFIG_MBEDTLS_ECP_DP_SECP224R1_ENABLED) #define MBEDTLS_ECP_DP_SECP224R1_ENABLED +#define PSA_WANT_ECC_SECP_R1_224 1 #endif #if defined(CONFIG_MBEDTLS_ECP_DP_SECP256R1_ENABLED) #define MBEDTLS_ECP_DP_SECP256R1_ENABLED +#define PSA_WANT_ECC_SECP_R1_256 1 #endif #if defined(CONFIG_MBEDTLS_ECP_DP_SECP384R1_ENABLED) #define MBEDTLS_ECP_DP_SECP384R1_ENABLED +#define PSA_WANT_ECC_SECP_R1_384 1 #endif #if defined(CONFIG_MBEDTLS_ECP_DP_SECP521R1_ENABLED) #define MBEDTLS_ECP_DP_SECP521R1_ENABLED +#define PSA_WANT_ECC_SECP_R1_521 1 #endif #if defined(CONFIG_MBEDTLS_ECP_DP_SECP192K1_ENABLED) #define MBEDTLS_ECP_DP_SECP192K1_ENABLED +#define PSA_WANT_ECC_SECP_K1_192 1 #endif #if defined(CONFIG_MBEDTLS_ECP_DP_SECP224K1_ENABLED) #define MBEDTLS_ECP_DP_SECP224K1_ENABLED +#define PSA_WANT_ECC_SECP_K1_224 1 #endif #if defined(CONFIG_MBEDTLS_ECP_DP_SECP256K1_ENABLED) #define MBEDTLS_ECP_DP_SECP256K1_ENABLED +#define PSA_WANT_ECC_SECP_K1_256 1 #endif #if defined(CONFIG_MBEDTLS_ECP_DP_BP256R1_ENABLED) #define MBEDTLS_ECP_DP_BP256R1_ENABLED +#define PSA_WANT_ECC_BRAINPOOL_P_R1_256 1 #endif #if defined(CONFIG_MBEDTLS_ECP_DP_BP384R1_ENABLED) #define MBEDTLS_ECP_DP_BP384R1_ENABLED +#define PSA_WANT_ECC_BRAINPOOL_P_R1_384 1 #endif #if defined(CONFIG_MBEDTLS_ECP_DP_BP512R1_ENABLED) #define MBEDTLS_ECP_DP_BP512R1_ENABLED +#define PSA_WANT_ECC_BRAINPOOL_P_R1_512 1 #endif #if defined(CONFIG_MBEDTLS_ECP_DP_CURVE25519_ENABLED) #define MBEDTLS_ECP_DP_CURVE25519_ENABLED +#define PSA_WANT_ECC_MONTGOMERY_255 1 #endif #if defined(CONFIG_MBEDTLS_ECP_DP_CURVE448_ENABLED) #define MBEDTLS_ECP_DP_CURVE448_ENABLED +#define PSA_WANT_ECC_MONTGOMERY_448 1 #endif #if defined(CONFIG_MBEDTLS_ECP_NIST_OPTIM)