From 49352832c9054ebff0f8542bc02038bf8a621a3a Mon Sep 17 00:00:00 2001 From: Dave Rodgman Date: Mon, 11 Sep 2023 17:09:13 +0100 Subject: [PATCH] Eliminate duplicate of mbedtls_asn1_find_named_data Signed-off-by: Dave Rodgman --- library/asn1write.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/library/asn1write.c b/library/asn1write.c index 7d533491f3..2e7c4a96f1 100644 --- a/library/asn1write.c +++ b/library/asn1write.c @@ -28,6 +28,10 @@ #include "mbedtls/platform.h" +#if defined(MBEDTLS_ASN1_PARSE_C) +#include "mbedtls/asn1.h" +#endif + int mbedtls_asn1_write_len(unsigned char **p, const unsigned char *start, size_t len) { #if SIZE_MAX > 0xFFFFFFFF @@ -353,6 +357,7 @@ int mbedtls_asn1_write_octet_string(unsigned char **p, const unsigned char *star } +#if !defined(MBEDTLS_ASN1_PARSE_C) /* This is a copy of the ASN.1 parsing function mbedtls_asn1_find_named_data(), * which is replicated to avoid a dependency ASN1_WRITE_C on ASN1_PARSE_C. */ static mbedtls_asn1_named_data *asn1_find_named_data( @@ -370,6 +375,10 @@ static mbedtls_asn1_named_data *asn1_find_named_data( return list; } +#else +#define asn1_find_named_data(list, oid, len) \ + ((mbedtls_asn1_named_data *) mbedtls_asn1_find_named_data(list, oid, len)) +#endif mbedtls_asn1_named_data *mbedtls_asn1_store_named_data( mbedtls_asn1_named_data **head,