Skip to content

Commit c605c49

Browse files
rluboscarlescufi
authored andcommitted
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 <[email protected]>
1 parent d47025b commit c605c49

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

modules/mbedtls/Kconfig.tls-generic

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ config MBEDTLS_SERVER_NAME_INDICATION
422422

423423
config MBEDTLS_PK_WRITE_C
424424
bool "The generic public (asymmetric) key writer"
425+
default y if MBEDTLS_PSA_CRYPTO_C
425426
help
426427
Enable generic public key write functions.
427428

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -394,15 +394,6 @@
394394
#define MBEDTLS_X509_USE_C
395395
#endif
396396

397-
#if defined(MBEDTLS_X509_USE_C) || \
398-
defined(MBEDTLS_ECDSA_C)
399-
#define MBEDTLS_ASN1_PARSE_C
400-
#endif
401-
402-
#if defined(MBEDTLS_ECDSA_C)
403-
#define MBEDTLS_ASN1_WRITE_C
404-
#endif
405-
406397
#if defined(MBEDTLS_DHM_C) || \
407398
defined(MBEDTLS_ECP_C) || \
408399
defined(MBEDTLS_RSA_C) || \
@@ -428,6 +419,14 @@
428419
#define MBEDTLS_PK_C
429420
#endif
430421

422+
#if defined(MBEDTLS_X509_USE_C) || defined(MBEDTLS_ECDSA_C)
423+
#define MBEDTLS_ASN1_PARSE_C
424+
#endif
425+
426+
#if defined(MBEDTLS_ECDSA_C) || defined(MBEDTLS_PK_WRITE_C)
427+
#define MBEDTLS_ASN1_WRITE_C
428+
#endif
429+
431430
#if defined(CONFIG_MBEDTLS_PKCS5_C)
432431
#define MBEDTLS_PKCS5_C
433432
#endif

0 commit comments

Comments
 (0)