Index: net/cert/x509_certificate_mac.cc |
diff --git a/net/cert/x509_certificate_mac.cc b/net/cert/x509_certificate_mac.cc |
index 96f7b52ab3d630fee014768fbf19e2539b343317..1d874c4b023b29541eb0dc5883e34c5d78c00335 100644 |
--- a/net/cert/x509_certificate_mac.cc |
+++ b/net/cert/x509_certificate_mac.cc |
@@ -206,60 +206,6 @@ struct CSSMOIDString { |
typedef std::vector<CSSMOIDString> CSSMOIDStringVector; |
-bool CERTNameToCSSMOIDVector(CERTName* name, CSSMOIDStringVector* out_values) { |
- struct OIDCSSMMap { |
- SECOidTag sec_OID_; |
- const CSSM_OID* cssm_OID_; |
- }; |
- |
- const OIDCSSMMap kOIDs[] = { |
- { SEC_OID_AVA_COMMON_NAME, &CSSMOID_CommonName }, |
- { SEC_OID_AVA_COUNTRY_NAME, &CSSMOID_CountryName }, |
- { SEC_OID_AVA_LOCALITY, &CSSMOID_LocalityName }, |
- { SEC_OID_AVA_STATE_OR_PROVINCE, &CSSMOID_StateProvinceName }, |
- { SEC_OID_AVA_STREET_ADDRESS, &CSSMOID_StreetAddress }, |
- { SEC_OID_AVA_ORGANIZATION_NAME, &CSSMOID_OrganizationName }, |
- { SEC_OID_AVA_ORGANIZATIONAL_UNIT_NAME, &CSSMOID_OrganizationalUnitName }, |
- { SEC_OID_AVA_DN_QUALIFIER, &CSSMOID_DNQualifier }, |
- { SEC_OID_RFC1274_UID, &CSSMOID_UniqueIdentifier }, |
- { SEC_OID_PKCS9_EMAIL_ADDRESS, &CSSMOID_EmailAddress }, |
- }; |
- |
- CERTRDN** rdns = name->rdns; |
- for (size_t rdn = 0; rdns[rdn]; ++rdn) { |
- CERTAVA** avas = rdns[rdn]->avas; |
- for (size_t pair = 0; avas[pair] != 0; ++pair) { |
- SECOidTag tag = CERT_GetAVATag(avas[pair]); |
- if (tag == SEC_OID_UNKNOWN) { |
- return false; |
- } |
- CSSMOIDString oidString; |
- bool found_oid = false; |
- for (size_t oid = 0; oid < ARRAYSIZE_UNSAFE(kOIDs); ++oid) { |
- if (kOIDs[oid].sec_OID_ == tag) { |
- SECItem* decode_item = CERT_DecodeAVAValue(&avas[pair]->value); |
- if (!decode_item) |
- return false; |
- |
- // TODO(wtc): Pass decode_item to CERT_RFC1485_EscapeAndQuote. |
- std::string value(reinterpret_cast<char*>(decode_item->data), |
- decode_item->len); |
- oidString.oid_ = kOIDs[oid].cssm_OID_; |
- oidString.string_ = value; |
- out_values->push_back(oidString); |
- SECITEM_FreeItem(decode_item, PR_TRUE); |
- found_oid = true; |
- break; |
- } |
- } |
- if (!found_oid) { |
- DLOG(ERROR) << "Unrecognized OID: " << tag; |
- } |
- } |
- } |
- return true; |
-} |
- |
class ScopedCertName { |
public: |
explicit ScopedCertName(CERTName* name) : name_(name) { } |