Parse CRL extensions in a switch statement

This commit is contained in:
Martin Willi
2011-01-05 16:46:03 +01:00
parent 6c547631c0
commit d14d3b31b8
+16 -10
View File
@@ -261,9 +261,12 @@ static bool parse(private_x509_crl_t *this)
{ {
int extn_oid = asn1_known_oid(extnID); int extn_oid = asn1_known_oid(extnID);
if (revoked && extn_oid == OID_CRL_REASON_CODE) switch (extn_oid)
{ {
if (*object.ptr == ASN1_ENUMERATED && case OID_CRL_REASON_CODE:
if (revoked)
{
if (object.len && *object.ptr == ASN1_ENUMERATED &&
asn1_length(&object) == 1) asn1_length(&object) == 1)
{ {
revoked->reason = *object.ptr; revoked->reason = *object.ptr;
@@ -271,22 +274,25 @@ static bool parse(private_x509_crl_t *this)
DBG2(DBG_LIB, " '%N'", crl_reason_names, DBG2(DBG_LIB, " '%N'", crl_reason_names,
revoked->reason); revoked->reason);
} }
else if (extn_oid == OID_AUTHORITY_KEY_ID) break;
{ case OID_AUTHORITY_KEY_ID:
this->authKeyIdentifier = x509_parse_authorityKeyIdentifier(object, this->authKeyIdentifier =
level, &this->authKeySerialNumber); x509_parse_authorityKeyIdentifier(
} object, level, &this->authKeySerialNumber);
else if (extn_oid == OID_CRL_NUMBER) break;
{ case OID_CRL_NUMBER:
if (!asn1_parse_simple_object(&object, ASN1_INTEGER, if (!asn1_parse_simple_object(&object, ASN1_INTEGER,
level, "crlNumber")) level, "crlNumber"))
{ {
goto end; goto end;
} }
this->crlNumber = object; this->crlNumber = object;
} break;
default:
break;
} }
break; break;
}
case CRL_OBJ_ALGORITHM: case CRL_OBJ_ALGORITHM:
{ {
this->algorithm = asn1_parse_algorithmIdentifier(object, level, NULL); this->algorithm = asn1_parse_algorithmIdentifier(object, level, NULL);