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

Merge pull request #4497 from cconlon/authInfo

Browse Source 
fix nid2oid/oid2nid for oidCertAuthInfoType
This commit is contained in:
David Garske
2021-10-25 09:29:09 -07:00
committed by GitHub
parent bf2b13939f 402ee29163
commit 517225e135
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ssl.c
View File

@@ -50718,9 +50718,9 @@ word32 nid2oid(int nid, int grp)
/* oidCertAuthInfoType */
case oidCertAuthInfoType:
switch (nid) {
case AIA_OCSP_OID:
case NID_ad_OCSP:
return AIA_OCSP_OID;
case AIA_CA_ISSUER_OID:
case NID_ad_ca_issuers:
return AIA_CA_ISSUER_OID;
}
break;
@@ -51071,9 +51071,9 @@ int oid2nid(word32 oid, int grp)
case oidCertAuthInfoType:
switch (oid) {
case AIA_OCSP_OID:
return AIA_OCSP_OID;
return NID_ad_OCSP;
case AIA_CA_ISSUER_OID:
return AIA_CA_ISSUER_OID;
return NID_ad_ca_issuers;
}
break;

2
tests/api.c
View File

@@ -43795,7 +43795,7 @@ static void test_wolfSSL_X509V3_EXT(void) {
#endif
AssertNotNull(adObj = ad->method);
/* Make sure nid is OCSP */
AssertIntEQ(wolfSSL_OBJ_obj2nid(adObj), AIA_OCSP_OID);
AssertIntEQ(wolfSSL_OBJ_obj2nid(adObj), NID_ad_OCSP);
/* GENERAL_NAME stores URI as an ASN1_STRING */
AssertNotNull(gn = ad->location);

2
wolfcrypt/src/asn.c
View File

@@ -14732,7 +14732,7 @@ static int DecodeAuthInfo(const byte* input, int sz, DecodedCert* cert)
{
cert->extAuthInfoSz = length;
cert->extAuthInfo = input + idx;
#if defined(OPENSSL_ALL) && defined(WOLFSSL_QT)
#if defined(OPENSSL_ALL) || defined(WOLFSSL_QT)
count++;
#else
break;