feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

add WOLFSSL_CERT_NAME_ALL macro guard and new values to set subject

Browse Source
This commit is contained in:
JacobBarthelmeh
2022-08-01 10:52:09 -07:00
parent abba59f735
commit 99ed727179
5 changed files with 82 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -830,6 +830,9 @@ then
# Certificate extensions and alt. names for FPKI use # Certificate extensions and alt. names for FPKI use
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SUBJ_DIR_ATTR -DWOLFSSL_FPKI -DWOLFSSL_SUBJ_INFO_ACC" AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_SUBJ_DIR_ATTR -DWOLFSSL_FPKI -DWOLFSSL_SUBJ_INFO_ACC"
# Handle as many subject/issuer name OIDs as possible
AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_CERT_NAME_ALL"
fi fi
@@ -7450,7 +7453,7 @@ then
fi fi
AS_IF([test "x$ENABLED_OPENSSLALL" = "xyes"], AS_IF([test "x$ENABLED_OPENSSLALL" = "xyes"],
[AM_CFLAGS="$AM_CFLAGS -DOPENSSL_ALL -DWOLFSSL_EITHER_SIDE -DWC_RSA_NO_PADDING -DWC_RSA_PSS -DWOLFSSL_PSS_LONG_SALT -DWOLFSSL_TICKET_HAVE_ID -DWOLFSSL_ERROR_CODE_OPENSSL"]) [AM_CFLAGS="$AM_CFLAGS -DOPENSSL_ALL -DWOLFSSL_EITHER_SIDE -DWC_RSA_NO_PADDING -DWC_RSA_PSS -DWOLFSSL_PSS_LONG_SALT -DWOLFSSL_TICKET_HAVE_ID -DWOLFSSL_ERROR_CODE_OPENSSL -DWOLFSSL_CERT_NAME_ALL"])
AS_IF([test "x$ENABLED_AESSIV" = "xyes"], [AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AES_SIV"]) AS_IF([test "x$ENABLED_AESSIV" = "xyes"], [AM_CFLAGS="$AM_CFLAGS -DWOLFSSL_AES_SIV"])

2
src/x509.c
View File

@@ -9403,10 +9403,12 @@ static int ConvertNIDToWolfSSL(int nid)
{ {
switch (nid) { switch (nid) {
case NID_commonName : return ASN_COMMON_NAME; case NID_commonName : return ASN_COMMON_NAME;
#ifdef WOLFSSL_CERT_NAME_ALL
case NID_name : return ASN_NAME; case NID_name : return ASN_NAME;
case NID_givenName: return ASN_GIVEN_NAME; case NID_givenName: return ASN_GIVEN_NAME;
case NID_dnQualifier : return ASN_DNQUALIFIER; case NID_dnQualifier : return ASN_DNQUALIFIER;
case NID_initials: return ASN_INITIALS; case NID_initials: return ASN_INITIALS;
#endif /* WOLFSSL_CERT_NAME_ALL */
case NID_surname : return ASN_SUR_NAME; case NID_surname : return ASN_SUR_NAME;
case NID_countryName: return ASN_COUNTRY_NAME; case NID_countryName: return ASN_COUNTRY_NAME;
case NID_localityName: return ASN_LOCALITY_NAME; case NID_localityName: return ASN_LOCALITY_NAME;

87
wolfcrypt/src/asn.c
View File

@@ -84,6 +84,9 @@ ASN Options:
extension. extension.
* WOLFSSL_SUBJ_INFO_ACC: Enable support for SubjectInfoAccess extension. * WOLFSSL_SUBJ_INFO_ACC: Enable support for SubjectInfoAccess extension.
* WOLFSSL_FPKI: Enable support for FPKI (Federal PKI) extensions. * WOLFSSL_FPKI: Enable support for FPKI (Federal PKI) extensions.
* WOLFSSL_CERT_NAME_ALL: Adds more certificate name capability at the
cost of taking up more memory. Adds initials, givenname, dnQualifer for
example.
*/ */
#ifndef NO_ASN #ifndef NO_ASN
@@ -9956,10 +9959,12 @@ void InitDecodedCert(DecodedCert* cert,
cert->heap = heap; cert->heap = heap;
cert->maxPathLen = WOLFSSL_MAX_PATH_LEN; cert->maxPathLen = WOLFSSL_MAX_PATH_LEN;
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
#ifdef WOLFSSL_CERT_NAME_ALL
cert->subjectNEnc = CTC_UTF8; cert->subjectNEnc = CTC_UTF8;
cert->subjectIEnc = CTC_UTF8; cert->subjectIEnc = CTC_UTF8;
cert->subjectDNQEnc = CTC_UTF8; cert->subjectDNQEnc = CTC_UTF8;
cert->subjectGNEnc = CTC_UTF8; cert->subjectGNEnc = CTC_UTF8;
#endif
cert->subjectSNEnc = CTC_UTF8; cert->subjectSNEnc = CTC_UTF8;
cert->subjectCEnc = CTC_PRINTABLE; cert->subjectCEnc = CTC_PRINTABLE;
cert->subjectLEnc = CTC_UTF8; cert->subjectLEnc = CTC_UTF8;
@@ -10702,10 +10707,12 @@ int wc_OBJ_sn2nid(const char *sn)
{WOLFSSL_STATE_NAME, NID_stateOrProvinceName}, {WOLFSSL_STATE_NAME, NID_stateOrProvinceName},
{WOLFSSL_ORG_NAME, NID_organizationName}, {WOLFSSL_ORG_NAME, NID_organizationName},
{WOLFSSL_ORGUNIT_NAME, NID_organizationalUnitName}, {WOLFSSL_ORGUNIT_NAME, NID_organizationalUnitName},
#ifdef WOLFSSL_CERT_NAME_ALL
{WOLFSSL_NAME, NID_name}, {WOLFSSL_NAME, NID_name},
{WOLFSSL_INITIALS, NID_initials}, {WOLFSSL_INITIALS, NID_initials},
{WOLFSSL_GIVEN_NAME, NID_givenName}, {WOLFSSL_GIVEN_NAME, NID_givenName},
{WOLFSSL_DNQUALIFIER, NID_dnQualifier}, {WOLFSSL_DNQUALIFIER, NID_dnQualifier},
#endif
{WOLFSSL_EMAIL_ADDR, NID_emailAddress}, {WOLFSSL_EMAIL_ADDR, NID_emailAddress},
{"SHA1", NID_sha1}, {"SHA1", NID_sha1},
{NULL, -1}}; {NULL, -1}};
@@ -11054,54 +11061,56 @@ static const CertNameData certNameSubject[] = {
NID_userId NID_userId
#endif #endif
}, },
#ifdef WOLFSSL_CERT_NAME_ALL
/* Name, id 41 */ /* Name, id 41 */
{ {
"/N=", 3, "/N=", 3,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectN), OFFSETOF(DecodedCert, subjectN),
OFFSETOF(DecodedCert, subjectNLen), OFFSETOF(DecodedCert, subjectNLen),
OFFSETOF(DecodedCert, subjectNEnc), OFFSETOF(DecodedCert, subjectNEnc),
#endif #endif
#ifdef WOLFSSL_X509_NAME_AVAILABLE #ifdef WOLFSSL_X509_NAME_AVAILABLE
NID_name NID_name
#endif #endif
}, },
/* Given Name, id 42 */ /* Given Name, id 42 */
{ {
"/GN=", 4, "/GN=", 4,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectGN), OFFSETOF(DecodedCert, subjectGN),
OFFSETOF(DecodedCert, subjectGNLen), OFFSETOF(DecodedCert, subjectGNLen),
OFFSETOF(DecodedCert, subjectGNEnc), OFFSETOF(DecodedCert, subjectGNEnc),
#endif #endif
#ifdef WOLFSSL_X509_NAME_AVAILABLE #ifdef WOLFSSL_X509_NAME_AVAILABLE
NID_givenName NID_givenName
#endif #endif
}, },
/* initials, id 43 */ /* initials, id 43 */
{ {
"/initials=", 10, "/initials=", 10,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectI), OFFSETOF(DecodedCert, subjectI),
OFFSETOF(DecodedCert, subjectILen), OFFSETOF(DecodedCert, subjectILen),
OFFSETOF(DecodedCert, subjectIEnc), OFFSETOF(DecodedCert, subjectIEnc),
#endif #endif
#ifdef WOLFSSL_X509_NAME_AVAILABLE #ifdef WOLFSSL_X509_NAME_AVAILABLE
NID_initials NID_initials
#endif #endif
}, },
/* DN Qualifier Name, id 46 */ /* DN Qualifier Name, id 46 */
{ {
"/dnQualifier=", 13, "/dnQualifier=", 13,
#if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT) #if defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT)
OFFSETOF(DecodedCert, subjectDNQ), OFFSETOF(DecodedCert, subjectDNQ),
OFFSETOF(DecodedCert, subjectDNQLen), OFFSETOF(DecodedCert, subjectDNQLen),
OFFSETOF(DecodedCert, subjectDNQEnc), OFFSETOF(DecodedCert, subjectDNQEnc),
#endif #endif
#ifdef WOLFSSL_X509_NAME_AVAILABLE #ifdef WOLFSSL_X509_NAME_AVAILABLE
NID_dnQualifier NID_dnQualifier
#endif #endif
}, },
#endif /* WOLFSSL_CERT_NAME_ALL */
}; };
static const int certNameSubjectSz = static const int certNameSubjectSz =
@@ -11637,6 +11646,7 @@ static int GetCertName(DecodedCert* cert, char* full, byte* hash, int nameType,
nid = NID_commonName; nid = NID_commonName;
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA */
} }
#ifdef WOLFSSL_CERT_NAME_ALL
else if (id == ASN_NAME) { else if (id == ASN_NAME) {
copy = WOLFSSL_NAME; copy = WOLFSSL_NAME;
copyLen = sizeof(WOLFSSL_NAME) - 1; copyLen = sizeof(WOLFSSL_NAME) - 1;
@@ -11701,6 +11711,7 @@ static int GetCertName(DecodedCert* cert, char* full, byte* hash, int nameType,
nid = NID_dnQualifier; nid = NID_dnQualifier;
#endif /* OPENSSL_EXTRA */ #endif /* OPENSSL_EXTRA */
} }
#endif /* WOLFSSL_CERT_NAME_ALL */
else if (id == ASN_SUR_NAME) { else if (id == ASN_SUR_NAME) {
copy = WOLFSSL_SUR_NAME; copy = WOLFSSL_SUR_NAME;
copyLen = sizeof(WOLFSSL_SUR_NAME) - 1; copyLen = sizeof(WOLFSSL_SUR_NAME) - 1;
@@ -22803,10 +22814,12 @@ static const byte nameOid[][NAME_OID_SZ] = {
{ 0x55, 0x04, ASN_STATE_NAME }, { 0x55, 0x04, ASN_STATE_NAME },
{ 0x55, 0x04, ASN_STREET_ADDR }, { 0x55, 0x04, ASN_STREET_ADDR },
{ 0x55, 0x04, ASN_LOCALITY_NAME }, { 0x55, 0x04, ASN_LOCALITY_NAME },
#ifdef WOLFSSL_CERT_NAME_ALL
{ 0x55, 0x04, ASN_NAME }, { 0x55, 0x04, ASN_NAME },
{ 0x55, 0x04, ASN_GIVEN_NAME }, { 0x55, 0x04, ASN_GIVEN_NAME },
{ 0x55, 0x04, ASN_INITIALS }, { 0x55, 0x04, ASN_INITIALS },
{ 0x55, 0x04, ASN_DNQUALIFIER }, { 0x55, 0x04, ASN_DNQUALIFIER },
#endif
{ 0x55, 0x04, ASN_SUR_NAME }, { 0x55, 0x04, ASN_SUR_NAME },
{ 0x55, 0x04, ASN_ORG_NAME }, { 0x55, 0x04, ASN_ORG_NAME },
{ 0x00, 0x00, ASN_DOMAIN_COMPONENT}, /* not actual OID - see dcOid */ { 0x00, 0x00, ASN_DOMAIN_COMPONENT}, /* not actual OID - see dcOid */
@@ -22848,6 +22861,7 @@ const char* GetOneCertName(CertName* name, int idx)
return name->street; return name->street;
case ASN_LOCALITY_NAME: case ASN_LOCALITY_NAME:
return name->locality; return name->locality;
#ifdef WOLFSSL_CERT_NAME_ALL
case ASN_NAME: case ASN_NAME:
return name->dnName; return name->dnName;
case ASN_GIVEN_NAME: case ASN_GIVEN_NAME:
@@ -22856,6 +22870,7 @@ const char* GetOneCertName(CertName* name, int idx)
return name->initials; return name->initials;
case ASN_DNQUALIFIER: case ASN_DNQUALIFIER:
return name->dnQualifier; return name->dnQualifier;
#endif /* WOLFSSL_CERT_NAME_ALL */
case ASN_SUR_NAME: case ASN_SUR_NAME:
return name->sur; return name->sur;
case ASN_ORG_NAME: case ASN_ORG_NAME:
@@ -22899,6 +22914,7 @@ static char GetNameType(CertName* name, int idx)
return name->streetEnc; return name->streetEnc;
case ASN_LOCALITY_NAME: case ASN_LOCALITY_NAME:
return name->localityEnc; return name->localityEnc;
#ifdef WOLFSSL_CERT_NAME_ALL
case ASN_NAME: case ASN_NAME:
return name->dnNameEnc; return name->dnNameEnc;
case ASN_GIVEN_NAME: case ASN_GIVEN_NAME:
@@ -22907,6 +22923,7 @@ static char GetNameType(CertName* name, int idx)
return name->initialsEnc; return name->initialsEnc;
case ASN_DNQUALIFIER: case ASN_DNQUALIFIER:
return name->dnQualifierEnc; return name->dnQualifierEnc;
#endif /* WOLFSSL_CERT_NAME_ALL */
case ASN_SUR_NAME: case ASN_SUR_NAME:
return name->surEnc; return name->surEnc;
case ASN_ORG_NAME: case ASN_ORG_NAME:
@@ -27646,13 +27663,6 @@ static void SetNameFromDcert(CertName* cn, DecodedCert* decoded)
cn->unit[sz] = '\0'; cn->unit[sz] = '\0';
cn->unitEnc = decoded->subjectOUEnc; cn->unitEnc = decoded->subjectOUEnc;
} }
if (decoded->subjectN) {
sz = (decoded->subjectNLen < CTC_NAME_SIZE) ? decoded->subjectNLen
: CTC_NAME_SIZE - 1;
XSTRNCPY(cn->dnName, decoded->subjectN, sz);
cn->dnName[sz] = '\0';
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
: CTC_NAME_SIZE - 1; : CTC_NAME_SIZE - 1;
@@ -27703,6 +27713,37 @@ static void SetNameFromDcert(CertName* cn, DecodedCert* decoded)
XSTRNCPY(cn->email, decoded->subjectEmail, sz); XSTRNCPY(cn->email, decoded->subjectEmail, sz);
cn->email[sz] = '\0'; cn->email[sz] = '\0';
} }
#if defined(WOLFSSL_CERT_NAME_ALL) && \
(defined(WOLFSSL_CERT_GEN) || defined(WOLFSSL_CERT_EXT))
if (decoded->subjectN) {
sz = (decoded->subjectNLen < CTC_NAME_SIZE) ? decoded->subjectNLen
: CTC_NAME_SIZE - 1;
XSTRNCPY(cn->dnName, decoded->subjectN, sz);
cn->dnName[sz] = '\0';
cn->dnNameEnc = decoded->subjectNEnc;
}
if (decoded->subjectI) {
sz = (decoded->subjectILen < CTC_NAME_SIZE) ? decoded->subjectILen
: CTC_NAME_SIZE - 1;
XSTRNCPY(cn->initials, decoded->subjectI, sz);
cn->initials[sz] = '\0';
cn->initialsEnc = decoded->subjectIEnc;
}
if (decoded->subjectGN) {
sz = (decoded->subjectGNLen < CTC_NAME_SIZE) ? decoded->subjectGNLen
: CTC_NAME_SIZE - 1;
XSTRNCPY(cn->givenName, decoded->subjectGN, sz);
cn->givenName[sz] = '\0';
cn->givenNameEnc = decoded->subjectGNEnc;
}
if (decoded->subjectDNQ) {
sz = (decoded->subjectDNQLen < CTC_NAME_SIZE) ? decoded->subjectDNQLen
: CTC_NAME_SIZE - 1;
XSTRNCPY(cn->dnQualifier, decoded->subjectDNQ, sz);
cn->dnQualifier[sz] = '\0';
cn->dnQualifierEnc = decoded->subjectDNQEnc;
}
#endif /* WOLFSSL_CERT_NAME_ALL */
} }
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM

14
wolfssl/wolfcrypt/asn.h
View File

@@ -674,10 +674,12 @@ enum DN_Tags {
ASN_BUS_CAT = 0x0f, /* businessCategory */ ASN_BUS_CAT = 0x0f, /* businessCategory */
ASN_POSTAL_CODE = 0x11, /* postalCode */ ASN_POSTAL_CODE = 0x11, /* postalCode */
ASN_USER_ID = 0x12, /* UserID */ ASN_USER_ID = 0x12, /* UserID */
#ifdef WOLFSSL_CERT_NAME_ALL
ASN_NAME = 0x2a, /* name */ ASN_NAME = 0x2a, /* name */
ASN_GIVEN_NAME = 0x29, /* GN */ ASN_GIVEN_NAME = 0x29, /* GN */
ASN_INITIALS = 0x2b, /* initials */ ASN_INITIALS = 0x2b, /* initials */
ASN_DNQUALIFIER = 0x2e, /* dnQualifier */ ASN_DNQUALIFIER = 0x2e, /* dnQualifier */
#endif /* WOLFSSL_CERT_NAME_ALL */
ASN_EMAIL_NAME = 0x98, /* not actual OID (see attrEmailOid) */ ASN_EMAIL_NAME = 0x98, /* not actual OID (see attrEmailOid) */
ASN_CUSTOM_NAME = 0x99, /* not actual OID (see CertOidField) */ ASN_CUSTOM_NAME = 0x99, /* not actual OID (see CertOidField) */
@@ -707,10 +709,12 @@ extern const WOLFSSL_ObjectInfo wolfssl_object_info[];
#define WOLFSSL_COMMON_NAME "/CN=" #define WOLFSSL_COMMON_NAME "/CN="
#define WOLFSSL_LN_COMMON_NAME "/commonName=" #define WOLFSSL_LN_COMMON_NAME "/commonName="
#define WOLFSSL_SUR_NAME "/SN=" #define WOLFSSL_SUR_NAME "/SN="
#define WOLFSSL_NAME "/N=" #ifdef WOLFSSL_CERT_NAME_ALL
#define WOLFSSL_INITIALS "/initials=" #define WOLFSSL_NAME "/N="
#define WOLFSSL_GIVEN_NAME "/GN=" #define WOLFSSL_INITIALS "/initials="
#define WOLFSSL_DNQUALIFIER "/dnQualifier=" #define WOLFSSL_GIVEN_NAME "/GN="
#define WOLFSSL_DNQUALIFIER "/dnQualifier="
#endif /* WOLFSSL_CERT_NAME_ALL */
#define WOLFSSL_SERIAL_NUMBER "/serialNumber=" #define WOLFSSL_SERIAL_NUMBER "/serialNumber="
#define WOLFSSL_COUNTRY_NAME "/C=" #define WOLFSSL_COUNTRY_NAME "/C="
#define WOLFSSL_LN_COUNTRY_NAME "/countryName=" #define WOLFSSL_LN_COUNTRY_NAME "/countryName="
@@ -1658,6 +1662,7 @@ struct DecodedCert {
char* subjectSN; char* subjectSN;
int subjectSNLen; int subjectSNLen;
char subjectSNEnc; char subjectSNEnc;
#ifdef WOLFSSL_CERT_NAME_ALL
char* subjectN; char* subjectN;
int subjectNLen; int subjectNLen;
char subjectNEnc; char subjectNEnc;
@@ -1670,6 +1675,7 @@ struct DecodedCert {
char* subjectDNQ; char* subjectDNQ;
int subjectDNQLen; int subjectDNQLen;
char subjectDNQEnc; char subjectDNQEnc;
#endif /*WOLFSSL_CERT_NAME_ALL */
char* subjectC; char* subjectC;
int subjectCLen; int subjectCLen;
char subjectCEnc; char subjectCEnc;

2
wolfssl/wolfcrypt/asn_public.h
View File

@@ -337,6 +337,7 @@ typedef struct CertName {
char localityEnc; char localityEnc;
char sur[CTC_NAME_SIZE]; char sur[CTC_NAME_SIZE];
char surEnc; char surEnc;
#ifdef WOLFSSL_CERT_NAME_ALL
char givenName[CTC_NAME_SIZE]; char givenName[CTC_NAME_SIZE];
char givenNameEnc; char givenNameEnc;
char initials[CTC_NAME_SIZE]; char initials[CTC_NAME_SIZE];
@@ -345,6 +346,7 @@ typedef struct CertName {
char dnQualifierEnc; char dnQualifierEnc;
char dnName[CTC_NAME_SIZE]; char dnName[CTC_NAME_SIZE];
char dnNameEnc; char dnNameEnc;
#endif /* WOLFSSL_CERT_NAME_ALL */
char org[CTC_NAME_SIZE]; char org[CTC_NAME_SIZE];
char orgEnc; char orgEnc;
char unit[CTC_NAME_SIZE]; char unit[CTC_NAME_SIZE];