fix nid2oid/oid2nid for oidCertAuthInfoType

This commit is contained in:
Chris Conlon
2021-10-22 16:53:18 -06:00
parent d83d16af59
commit 402ee29163
3 changed files with 6 additions and 6 deletions

View File

@ -50716,9 +50716,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;
@ -51069,9 +51069,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;

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);

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;