зеркало из https://github.com/mozilla/gecko-dev.git
Bug 510135: Don't need to decode policy OID in CERTPolicyInfo
because the 'oid' member contains the decoded policy OID. Use CERT_REV_M_IGNORE_MISSING_FRESH_INFO (the default) for clarity. r=alexei.volkov
This commit is contained in:
Родитель
1575b22d42
Коммит
683a2e9c02
|
@ -893,7 +893,7 @@ static SECStatus getFirstEVPolicy(CERTCertificate *cert, SECOidTag &outOidTag)
|
||||||
while (*policyInfos != NULL) {
|
while (*policyInfos != NULL) {
|
||||||
policyInfo = *policyInfos++;
|
policyInfo = *policyInfos++;
|
||||||
|
|
||||||
SECOidTag oid_tag = SECOID_FindOIDTag(&policyInfo->policyID);
|
SECOidTag oid_tag = policyInfo->oid;
|
||||||
if (oid_tag == SEC_OID_UNKNOWN) // not in our list of OIDs accepted for EV
|
if (oid_tag == SEC_OID_UNKNOWN) // not in our list of OIDs accepted for EV
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
@ -1004,6 +1004,7 @@ nsNSSCertificate::hasValidEVOidTag(SECOidTag &resultOidTag, PRBool &validEV)
|
||||||
| CERT_REV_M_ALLOW_NETWORK_FETCHING
|
| CERT_REV_M_ALLOW_NETWORK_FETCHING
|
||||||
| CERT_REV_M_ALLOW_IMPLICIT_DEFAULT_SOURCE
|
| CERT_REV_M_ALLOW_IMPLICIT_DEFAULT_SOURCE
|
||||||
| CERT_REV_M_REQUIRE_INFO_ON_MISSING_SOURCE
|
| CERT_REV_M_REQUIRE_INFO_ON_MISSING_SOURCE
|
||||||
|
| CERT_REV_M_IGNORE_MISSING_FRESH_INFO
|
||||||
| CERT_REV_M_STOP_TESTING_ON_FRESH_INFO;
|
| CERT_REV_M_STOP_TESTING_ON_FRESH_INFO;
|
||||||
|
|
||||||
PRUint64 revMethodIndependentFlags =
|
PRUint64 revMethodIndependentFlags =
|
||||||
|
|
|
@ -1412,8 +1412,7 @@ ProcessCertificatePolicies(SECItem *extData,
|
||||||
// because we want to display the EV information string
|
// because we want to display the EV information string
|
||||||
// next to the correct OID.
|
// next to the correct OID.
|
||||||
|
|
||||||
SECOidTag oid_tag = SECOID_FindOIDTag(&policyInfo->policyID);
|
if (policyInfo->oid == ev_oid_tag) {
|
||||||
if (oid_tag == ev_oid_tag) {
|
|
||||||
text.Append(NS_LITERAL_STRING(":"));
|
text.Append(NS_LITERAL_STRING(":"));
|
||||||
text.Append(NS_LITERAL_STRING(SEPARATOR));
|
text.Append(NS_LITERAL_STRING(SEPARATOR));
|
||||||
needColon = PR_FALSE;
|
needColon = PR_FALSE;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче