Index: chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp |
=================================================================== |
--- chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp (revision 91643) |
+++ chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp (working copy) |
@@ -117,6 +117,8 @@ |
SECOidTag eku_ms_smart_card_logon = SEC_OID_UNKNOWN; |
SECOidTag eku_ms_key_recovery_agent = SEC_OID_UNKNOWN; |
SECOidTag eku_netscape_international_step_up = SEC_OID_UNKNOWN; |
+SECOidTag cert_attribute_business_category = SEC_OID_UNKNOWN; |
+SECOidTag cert_attribute_ev_incorporation_country = SEC_OID_UNKNOWN; |
void RegisterDynamicOids() { |
if (ms_cert_ext_certtype != SEC_OID_UNKNOWN) |
@@ -125,7 +127,7 @@ |
ms_cert_ext_certtype = RegisterDynamicOid("1.3.6.1.4.1.311.20.2"); |
ms_certsrv_ca_version = RegisterDynamicOid("1.3.6.1.4.1.311.21.1"); |
ms_nt_principal_name = RegisterDynamicOid("1.3.6.1.4.1.311.20.2.3"); |
- ms_nt_principal_name = RegisterDynamicOid("1.3.6.1.4.1.311.25.1"); |
wtc
2011/07/07 02:22:50
This must have been a copy-and-paste error.
|
+ ms_ntds_replication = RegisterDynamicOid("1.3.6.1.4.1.311.25.1"); |
eku_ms_individual_code_signing = RegisterDynamicOid("1.3.6.1.4.1.311.2.1.21"); |
eku_ms_commercial_code_signing = RegisterDynamicOid("1.3.6.1.4.1.311.2.1.22"); |
@@ -145,6 +147,13 @@ |
eku_ms_key_recovery_agent = RegisterDynamicOid("1.3.6.1.4.1.311.21.6"); |
eku_netscape_international_step_up = RegisterDynamicOid( |
"2.16.840.1.113730.4.1"); |
+ |
+ // These two OIDs will be built-in as SEC_OID_BUSINESS_CATEGORY and |
+ // SEC_OID_EV_INCORPORATION_COUNTRY starting in NSS 3.13. Until then, |
+ // we need to add them dynamically. |
+ cert_attribute_business_category = RegisterDynamicOid("2.5.4.15"); |
+ cert_attribute_ev_incorporation_country = RegisterDynamicOid( |
+ "1.3.6.1.4.1.311.60.2.1.3"); |
} |
std::string DumpOidString(SECItem* oid) { |
@@ -318,6 +327,9 @@ |
case SEC_OID_PKIX_USER_NOTICE_QUALIFIER: |
string_id = IDS_CERT_PKIX_USER_NOTICE_QUALIFIER; |
break; |
+ case SEC_OID_UNKNOWN: |
+ string_id = -1; |
+ break; |
wtc
2011/07/07 02:22:50
With this SEC_OID_UNKNOWN case alone, the certific
|
// There are a billionty other OIDs we could add here. I tried to get the |
// important ones... |
@@ -360,6 +372,10 @@ |
string_id = IDS_CERT_EKU_MS_KEY_RECOVERY_AGENT; |
else if (oid_tag == eku_netscape_international_step_up) |
string_id = IDS_CERT_EKU_NETSCAPE_INTERNATIONAL_STEP_UP; |
+ else if (oid_tag == cert_attribute_business_category) |
+ string_id = IDS_CERT_OID_BUSINESS_CATEGORY; |
+ else if (oid_tag == cert_attribute_ev_incorporation_country) |
+ string_id = IDS_CERT_OID_EV_INCORPORATION_COUNTRY; |
else |
string_id = -1; |
break; |