Index: net/base/ev_root_ca_metadata.h |
=================================================================== |
--- net/base/ev_root_ca_metadata.h (revision 150170) |
+++ net/base/ev_root_ca_metadata.h (working copy) |
@@ -12,6 +12,7 @@ |
#endif |
#include <map> |
+#include <string> |
#include <vector> |
#include "net/base/net_export.h" |
@@ -39,7 +40,7 @@ |
#if defined(USE_NSS) |
// If the root CA cert has an EV policy OID, returns true and appends the |
// policy OIDs to |*policy_oids|. Otherwise, returns false. |
- bool GetPolicyOIDsForCA(const SHA1Fingerprint& fingerprint, |
+ bool GetPolicyOIDsForCA(const SHA1HashValue& fingerprint, |
std::vector<PolicyOID>* policy_oids) const; |
const PolicyOID* GetPolicyOIDs() const; |
int NumPolicyOIDs() const; |
@@ -49,18 +50,18 @@ |
// Returns true if the root CA with the given certificate fingerprint has |
// the EV policy OID policy_oid. |
- bool HasEVPolicyOID(const SHA1Fingerprint& fingerprint, |
+ bool HasEVPolicyOID(const SHA1HashValue& fingerprint, |
PolicyOID policy_oid) const; |
#endif |
// AddEVCA adds an EV CA to the list of known EV CAs with the given policy. |
// |policy| is expressed as a string of dotted numbers. It returns true on |
// success. |
- bool AddEVCA(const SHA1Fingerprint& fingerprint, const char* policy); |
+ bool AddEVCA(const SHA1HashValue& fingerprint, const char* policy); |
// RemoveEVCA removes an EV CA that was previously added by AddEVCA. It |
// returns true on success. |
- bool RemoveEVCA(const SHA1Fingerprint& fingerprint); |
+ bool RemoveEVCA(const SHA1HashValue& fingerprint); |
private: |
friend struct base::DefaultLazyInstanceTraits<EVRootCAMetadata>; |
@@ -69,8 +70,8 @@ |
~EVRootCAMetadata(); |
#if defined(USE_NSS) |
- typedef std::map<SHA1Fingerprint, std::vector<PolicyOID>, |
- SHA1FingerprintLessThan> PolicyOIDMap; |
+ typedef std::map<SHA1HashValue, std::vector<PolicyOID>, |
+ SHA1HashValueLessThan> PolicyOIDMap; |
// RegisterOID registers |policy|, a policy OID in dotted string form, and |
// writes the memoized form to |*out|. It returns true on success. |
@@ -79,8 +80,8 @@ |
PolicyOIDMap ev_policy_; |
std::vector<PolicyOID> policy_oids_; |
#elif defined(OS_WIN) |
- typedef std::map<SHA1Fingerprint, std::string, |
- SHA1FingerprintLessThan> ExtraEVCAMap; |
+ typedef std::map<SHA1HashValue, std::string, |
+ SHA1HashValueLessThan> ExtraEVCAMap; |
// extra_cas_ contains any EV CA metadata that was added at runtime. |
ExtraEVCAMap extra_cas_; |