Merge pull request #504 from dgarske/oid_unknown_fix

Fix for "OID Check Failed"
This commit is contained in:
toddouska
2016-07-27 14:16:04 -07:00
committed by GitHub

View File

@@ -1229,10 +1229,9 @@ int GetObjectId(const byte* input, word32* inOutIdx, word32* oid,
#endif /* HAVE_OID_DECODING */ #endif /* HAVE_OID_DECODING */
#endif #endif
if (checkOid == NULL || if (checkOid != NULL &&
(checkOid != NULL && (checkOidSz != actualOidSz || (checkOidSz != actualOidSz ||
XMEMCMP(actualOid, checkOid, checkOidSz) != 0))) XMEMCMP(actualOid, checkOid, checkOidSz) != 0)) {
{
WOLFSSL_MSG("OID Check Failed"); WOLFSSL_MSG("OID Check Failed");
return ASN_UNKNOWN_OID_E; return ASN_UNKNOWN_OID_E;
} }
@@ -4826,10 +4825,8 @@ static int DecodeCertExtensions(DecodedCert* cert)
oid = 0; oid = 0;
if ((ret = GetObjectId(input, &idx, &oid, oidCertExtType, sz)) < 0) { if ((ret = GetObjectId(input, &idx, &oid, oidCertExtType, sz)) < 0) {
if (ret != ASN_UNKNOWN_OID_E) { WOLFSSL_MSG("\tfail: OBJECT ID");
WOLFSSL_MSG("\tfail: OBJECT ID"); return ret;
return ret;
}
} }
/* check for critical flag */ /* check for critical flag */