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

Merge pull request #3948 from miyazakh/qt_unittest_cert

Browse Source 
added favourite drink pilot attribute
This commit is contained in:
Chris Conlon
2021-04-20 09:50:30 -06:00
committed by GitHub
parent d08a2b1761 f8e7f9bf03
commit bd5dc0b21d
4 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ssl.c
View File

@@ -31578,8 +31578,8 @@ const WOLFSSL_ObjectInfo wolfssl_object_info[] = {
"certificatePolicies", "X509v3 Certificate Policies"},
/* oidCertAuthInfoType */
{ AIA_OCSP_OID, AIA_OCSP_OID, oidCertAuthInfoType, "authorityInfoAccess",
"Authority Information Access"},
{ AIA_OCSP_OID, AIA_OCSP_OID, oidCertAuthInfoType, "OCSP",
"OCSP"},
{ AIA_CA_ISSUER_OID, AIA_CA_ISSUER_OID, oidCertAuthInfoType,
"caIssuers", "CA Issuers"},
@@ -31617,6 +31617,8 @@ const WOLFSSL_ObjectInfo wolfssl_object_info[] = {
"emailAddress"},
{ NID_domainComponent, NID_domainComponent, oidCertNameType, "DC",
"domainComponent"},
{ NID_favouriteDrink, NID_favouriteDrink, oidCertNameType, "favouriteDrink",
"favouriteDrink"},
{ NID_businessCategory, NID_businessCategory, oidCertNameType, "businessCategory",
"businessCategory"},
{ NID_jurisdictionCountryName, NID_jurisdictionCountryName, oidCertNameType, "jurisdictionC",

9
wolfcrypt/src/asn.c
View File

@@ -6169,6 +6169,15 @@ int GetName(DecodedCert* cert, int nameType, int maxIdx)
nid = NID_domainComponent;
#endif /* OPENSSL_EXTRA */
break;
case ASN_FAVOURITE_DRINK:
copy = WOLFSSL_FAVOURITE_DRINK;
copyLen = sizeof(WOLFSSL_FAVOURITE_DRINK) - 1;
#if (defined(OPENSSL_EXTRA) || \
defined(OPENSSL_EXTRA_X509_SMALL)) \
&& !defined(WOLFCRYPT_ONLY)
nid = NID_favouriteDrink;
#endif /* OPENSSL_EXTRA */
break;
default:
WOLFSSL_MSG("Unknown pilot attribute type");

2
wolfssl/openssl/obj_mac.h
View File

@@ -42,6 +42,8 @@
#define NID_sect571k1 733
#define NID_sect571r1 734
/* the definition is for Qt Unit test */
#define SN_jurisdictionCountryName "jurisdictionC"
#ifdef __cplusplus
} /* extern "C" */
#endif

3
wolfssl/wolfcrypt/asn.h
View File

@@ -140,6 +140,7 @@ enum DN_Tags {
/* pilot attribute types
* OID values of 0.9.2342.19200300.100.1.* */
ASN_USER_ID = 0x01, /* UID */
ASN_FAVOURITE_DRINK = 0x05, /* favouriteDrink */
ASN_DOMAIN_COMPONENT = 0x19 /* DC */
};
@@ -182,6 +183,7 @@ extern const WOLFSSL_ObjectInfo wolfssl_object_info[];
#define WOLFSSL_USER_ID "/UID="
#define WOLFSSL_DOMAIN_COMPONENT "/DC="
#define WOLFSSL_FAVOURITE_DRINK "/favouriteDrink="
#if defined(WOLFSSL_APACHE_HTTPD)
/* otherName strings */
@@ -247,6 +249,7 @@ enum
NID_jurisdictionStateOrProvinceName = 0xd,
NID_businessCategory = ASN_BUS_CAT,
NID_domainComponent = ASN_DOMAIN_COMPONENT,
NID_favouriteDrink = 462,
NID_userId = 458,
NID_emailAddress = 0x30, /* emailAddress */
NID_id_on_dnsSRV = 82, /* 1.3.6.1.5.5.7.8.7 */