wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-04 13:14:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

resolve name conflict

Browse Source
This commit is contained in:
JacobBarthelmeh
2022-07-14 09:41:36 -07:00
parent f6c4e295b1
commit 8862e1f8cf
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wolfcrypt/src/asn.c
View File

@@ -22845,7 +22845,7 @@ const char* GetOneCertName(CertName* name, int idx)
case ASN_LOCALITY_NAME: case ASN_LOCALITY_NAME:
return name->locality; return name->locality;
case ASN_NAME: case ASN_NAME:
return name->name; return name->dnName;
case ASN_GIVEN_NAME: case ASN_GIVEN_NAME:
return name->givenName; return name->givenName;
case ASN_INITIALS: case ASN_INITIALS:
@@ -22896,7 +22896,7 @@ static char GetNameType(CertName* name, int idx)
case ASN_LOCALITY_NAME: case ASN_LOCALITY_NAME:
return name->localityEnc; return name->localityEnc;
case ASN_NAME: case ASN_NAME:
return name->nameEnc; return name->dnNameEnc;
case ASN_GIVEN_NAME: case ASN_GIVEN_NAME:
return name->givenNameEnc; return name->givenNameEnc;
case ASN_INITIALS: case ASN_INITIALS:
@@ -27645,9 +27645,9 @@ static void SetNameFromDcert(CertName* cn, DecodedCert* decoded)
if (decoded->subjectN) { if (decoded->subjectN) {
sz = (decoded->subjectNLen < CTC_NAME_SIZE) ? decoded->subjectNLen sz = (decoded->subjectNLen < CTC_NAME_SIZE) ? decoded->subjectNLen
: CTC_NAME_SIZE - 1; : CTC_NAME_SIZE - 1;
XSTRNCPY(cn->name, decoded->subjectN, sz); XSTRNCPY(cn->dnName, decoded->subjectN, sz);
cn->name[sz] = '\0'; cn->dnName[sz] = '\0';
cn->nameEnc = decoded->subjectNEnc; cn->dnNameEnc = decoded->subjectNEnc;
} }
if (decoded->subjectSN) { if (decoded->subjectSN) {
sz = (decoded->subjectSNLen < CTC_NAME_SIZE) ? decoded->subjectSNLen sz = (decoded->subjectSNLen < CTC_NAME_SIZE) ? decoded->subjectSNLen

4
wolfssl/wolfcrypt/asn_public.h
View File

@@ -343,8 +343,8 @@ typedef struct CertName {
char initialsEnc; char initialsEnc;
char dnQualifier[CTC_NAME_SIZE]; char dnQualifier[CTC_NAME_SIZE];
char dnQualifierEnc; char dnQualifierEnc;
char name[CTC_NAME_SIZE]; char dnName[CTC_NAME_SIZE];
char nameEnc; char dnNameEnc;
char org[CTC_NAME_SIZE]; char org[CTC_NAME_SIZE];
char orgEnc; char orgEnc;
char unit[CTC_NAME_SIZE]; char unit[CTC_NAME_SIZE];