michaelh/zephyr
1
0
Fork 0
Code Releases Activity

modules: mbedtls: Fix dependencies with PSA crypto enabled

Browse source 
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>
This commit is contained in:
Robert Lubos 2023-07-25 14:48:33 +02:00 • committed by Carles Cufí
commit c605c4930b
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
modules/mbedtls/Kconfig.tls-generic
View file

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

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

@ -394,15 +394,6 @@
#define MBEDTLS_X509_USE_C
#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) || \
defined(MBEDTLS_ECP_C) || \
defined(MBEDTLS_RSA_C) || \
@ -428,6 +419,14 @@
#define MBEDTLS_PK_C
#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)
#define MBEDTLS_PKCS5_C
#endif