From 8862e1f8cfb8be8019e4fb959700b139860b7a72 Mon Sep 17 00:00:00 2001
From: JacobBarthelmeh <jacob@wolfssl.com>
Date: Thu, 14 Jul 2022 09:41:36 -0700
Subject: [PATCH] resolve name conflict

---
 wolfcrypt/src/asn.c            | 10 +++++-----
 wolfssl/wolfcrypt/asn_public.h |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/wolfcrypt/src/asn.c b/wolfcrypt/src/asn.c
index 8202f1ed6..c5bef8a5e 100644
--- a/wolfcrypt/src/asn.c
+++ b/wolfcrypt/src/asn.c
@@ -22845,7 +22845,7 @@ const char* GetOneCertName(CertName* name, int idx)
     case ASN_LOCALITY_NAME:
        return name->locality;
     case ASN_NAME:
-       return name->name;
+       return name->dnName;
     case ASN_GIVEN_NAME:
        return name->givenName;
     case ASN_INITIALS:
@@ -22896,7 +22896,7 @@ static char GetNameType(CertName* name, int idx)
     case ASN_LOCALITY_NAME:
        return name->localityEnc;
     case ASN_NAME:
-       return name->nameEnc;
+       return name->dnNameEnc;
     case ASN_GIVEN_NAME:
        return name->givenNameEnc;
     case ASN_INITIALS:
@@ -27645,9 +27645,9 @@ static void SetNameFromDcert(CertName* cn, DecodedCert* decoded)
     if (decoded->subjectN) {
         sz = (decoded->subjectNLen < CTC_NAME_SIZE) ? decoded->subjectNLen
                                                      : CTC_NAME_SIZE - 1;
-        XSTRNCPY(cn->name, decoded->subjectN, sz);
-        cn->name[sz] = '\0';
-        cn->nameEnc = decoded->subjectNEnc;
+        XSTRNCPY(cn->dnName, decoded->subjectN, sz);
+        cn->dnName[sz] = '\0';
+        cn->dnNameEnc = decoded->subjectNEnc;
     }
     if (decoded->subjectSN) {
         sz = (decoded->subjectSNLen < CTC_NAME_SIZE) ? decoded->subjectSNLen
diff --git a/wolfssl/wolfcrypt/asn_public.h b/wolfssl/wolfcrypt/asn_public.h
index 556acedc7..49078277b 100644
--- a/wolfssl/wolfcrypt/asn_public.h
+++ b/wolfssl/wolfcrypt/asn_public.h
@@ -343,8 +343,8 @@ typedef struct CertName {
     char initialsEnc;
     char dnQualifier[CTC_NAME_SIZE];
     char dnQualifierEnc;
-    char name[CTC_NAME_SIZE];
-    char nameEnc;
+    char dnName[CTC_NAME_SIZE];
+    char dnNameEnc;
     char org[CTC_NAME_SIZE];
     char orgEnc;
     char unit[CTC_NAME_SIZE];