Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(51)

Unified Diff: net/base/ev_root_ca_metadata.h

Issue 10836150: Revert 150375 - Implement SHA-256 fingerprint support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/cert_verify_result.cc ('k') | net/base/ev_root_ca_metadata.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/ev_root_ca_metadata.h
===================================================================
--- net/base/ev_root_ca_metadata.h (revision 150506)
+++ net/base/ev_root_ca_metadata.h (working copy)
@@ -12,7 +12,6 @@
#endif
#include <map>
-#include <string>
#include <vector>
#include "net/base/net_export.h"
@@ -40,7 +39,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 SHA1HashValue& fingerprint,
+ bool GetPolicyOIDsForCA(const SHA1Fingerprint& fingerprint,
std::vector<PolicyOID>* policy_oids) const;
const PolicyOID* GetPolicyOIDs() const;
int NumPolicyOIDs() const;
@@ -50,18 +49,18 @@
// Returns true if the root CA with the given certificate fingerprint has
// the EV policy OID policy_oid.
- bool HasEVPolicyOID(const SHA1HashValue& fingerprint,
+ bool HasEVPolicyOID(const SHA1Fingerprint& 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 SHA1HashValue& fingerprint, const char* policy);
+ bool AddEVCA(const SHA1Fingerprint& fingerprint, const char* policy);
// RemoveEVCA removes an EV CA that was previously added by AddEVCA. It
// returns true on success.
- bool RemoveEVCA(const SHA1HashValue& fingerprint);
+ bool RemoveEVCA(const SHA1Fingerprint& fingerprint);
private:
friend struct base::DefaultLazyInstanceTraits<EVRootCAMetadata>;
@@ -70,8 +69,8 @@
~EVRootCAMetadata();
#if defined(USE_NSS)
- typedef std::map<SHA1HashValue, std::vector<PolicyOID>,
- SHA1HashValueLessThan> PolicyOIDMap;
+ typedef std::map<SHA1Fingerprint, std::vector<PolicyOID>,
+ SHA1FingerprintLessThan> PolicyOIDMap;
// RegisterOID registers |policy|, a policy OID in dotted string form, and
// writes the memoized form to |*out|. It returns true on success.
@@ -80,8 +79,8 @@
PolicyOIDMap ev_policy_;
std::vector<PolicyOID> policy_oids_;
#elif defined(OS_WIN)
- typedef std::map<SHA1HashValue, std::string,
- SHA1HashValueLessThan> ExtraEVCAMap;
+ typedef std::map<SHA1Fingerprint, std::string,
+ SHA1FingerprintLessThan> ExtraEVCAMap;
// extra_cas_ contains any EV CA metadata that was added at runtime.
ExtraEVCAMap extra_cas_;
« no previous file with comments | « net/base/cert_verify_result.cc ('k') | net/base/ev_root_ca_metadata.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698