Browse Source

modules: mbedtls: Fix dependencies with PSA crypto enabled

After an update to mbed TLS 3.3.0, dependencies with
CONFIG_MBEDTLS_PSA_CRYPTO_C enabled got affected.

mbed TLS in its build_info.h file, enables MBEDTLS_PK_WRITE_C config
under the hood. MBEDTLS_PK_WRITE_C has a dependency to
MBEDTLS_ASN1_WRITE_C which wasn't reflected anywhere.

Therefore, update Kconfig.tls-generic to enable
CONFIG_MBEDTLS_PK_WRITE_C automatically, when PSA crypto is enabled, to
reflect mbed TLS configuration pattern. Additionally, enable
MBEDTLS_ASN1_WRITE_C automatically, when PK write is enabled.

Signed-off-by: Robert Lubos <robert.lubos@nordicsemi.no>
pull/61065/head
Robert Lubos 2 years ago committed by Carles Cufí
parent
commit
c605c4930b
  1. 1
      modules/mbedtls/Kconfig.tls-generic
  2. 17
      modules/mbedtls/configs/config-tls-generic.h

1
modules/mbedtls/Kconfig.tls-generic

@ -422,6 +422,7 @@ config MBEDTLS_SERVER_NAME_INDICATION
config MBEDTLS_PK_WRITE_C config MBEDTLS_PK_WRITE_C
bool "The generic public (asymmetric) key writer" bool "The generic public (asymmetric) key writer"
default y if MBEDTLS_PSA_CRYPTO_C
help help
Enable generic public key write functions. Enable generic public key write functions.

17
modules/mbedtls/configs/config-tls-generic.h

@ -394,15 +394,6 @@
#define MBEDTLS_X509_USE_C #define MBEDTLS_X509_USE_C
#endif #endif
#if defined(MBEDTLS_X509_USE_C) || \
defined(MBEDTLS_ECDSA_C)
#define MBEDTLS_ASN1_PARSE_C
#endif
#if defined(MBEDTLS_ECDSA_C)
#define MBEDTLS_ASN1_WRITE_C
#endif
#if defined(MBEDTLS_DHM_C) || \ #if defined(MBEDTLS_DHM_C) || \
defined(MBEDTLS_ECP_C) || \ defined(MBEDTLS_ECP_C) || \
defined(MBEDTLS_RSA_C) || \ defined(MBEDTLS_RSA_C) || \
@ -428,6 +419,14 @@
#define MBEDTLS_PK_C #define MBEDTLS_PK_C
#endif #endif
#if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_ECDSA_C)
#define MBEDTLS_ASN1_PARSE_C
#endif
#if defined(MBEDTLS_ECDSA_C) || defined(MBEDTLS_PK_WRITE_C)
#define MBEDTLS_ASN1_WRITE_C
#endif
#if defined(CONFIG_MBEDTLS_PKCS5_C) #if defined(CONFIG_MBEDTLS_PKCS5_C)
#define MBEDTLS_PKCS5_C #define MBEDTLS_PKCS5_C
#endif #endif

Loading…
Cancel
Save