From 026710d5ba59ecd1784edd6922b01664cc4166a0 Mon Sep 17 00:00:00 2001 From: Seo Suchan Date: Tue, 7 May 2024 14:20:02 +0900 Subject: [PATCH] mbedtls: fix compile on mbedtls 3.6+ they moved mbedtls_x509_get_name into interal zone. Signed-off-by: Seo Suchan --- lib/tls/mbedtls/mbedtls-extensions.c | 6 +++++- lib/tls/mbedtls/private-lib-tls-mbedtls.h | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/lib/tls/mbedtls/mbedtls-extensions.c b/lib/tls/mbedtls/mbedtls-extensions.c index bf275eefe4..7b797f6455 100644 --- a/lib/tls/mbedtls/mbedtls-extensions.c +++ b/lib/tls/mbedtls/mbedtls-extensions.c @@ -250,7 +250,11 @@ lws_mbedtls_x509_parse_general_name(const mbedtls_x509_buf *name_buf, *p = *p - 2; rfc822Name.MBEDTLS_PRIVATE_V30_ONLY(next) = NULL; - ret = mbedtls_x509_get_name( p, end, &rfc822Name ); +#if (MBEDTLS_VERSION_MAJOR == 3) && (MBEDTLS_VERSION_MINOR >= 6) + ret = MBEDTLS_PRIVATE(mbedtls_x509_get_name( p, end, &rfc822Name )); +#else + ret = mbedtls_x509_get_name( p, end, &rfc822Name ); +#endif if (ret) { lws_x509_clean_name(&rfc822Name); return ret; diff --git a/lib/tls/mbedtls/private-lib-tls-mbedtls.h b/lib/tls/mbedtls/private-lib-tls-mbedtls.h index 162d972680..509b5ed52b 100644 --- a/lib/tls/mbedtls/private-lib-tls-mbedtls.h +++ b/lib/tls/mbedtls/private-lib-tls-mbedtls.h @@ -57,3 +57,9 @@ lws_tls_mbedtls_cert_info(mbedtls_x509_crt *x509, enum lws_tls_cert_info type, int lws_x509_get_crt_ext(mbedtls_x509_crt *crt, mbedtls_x509_buf *skid, lws_mbedtls_x509_authority *akid); + +#if (MBEDTLS_VERSION_MAJOR == 3) && (MBEDTLS_VERSION_MINOR >= 6) + int MBEDTLS_PRIVATE(mbedtls_x509_get_name(unsigned char **p, const unsigned char *end, + mbedtls_x509_name *cur)); +#endif +