summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-20 20:17:30 +0000
committeravi@google.com <avi@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-20 20:17:30 +0000
commit5e1981a5b831f6a17e6899ca449d7ec49e91cb89 (patch)
tree3fd6ec10823d38188adc8ef5145362bf5ae3c79b /net
parent90c5e8612c9fce08cb8f9af4b723c0de6f8c05af (diff)
downloadchromium_src-5e1981a5b831f6a17e6899ca449d7ec49e91cb89.zip
chromium_src-5e1981a5b831f6a17e6899ca449d7ec49e91cb89.tar.gz
chromium_src-5e1981a5b831f6a17e6899ca449d7ec49e91cb89.tar.bz2
Fixing extended verification code for non-windows
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1101 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/ev_root_ca_metadata.cc2
-rw-r--r--net/base/ev_root_ca_metadata.h2
-rw-r--r--net/net.xcodeproj/project.pbxproj2
3 files changed, 4 insertions, 2 deletions
diff --git a/net/base/ev_root_ca_metadata.cc b/net/base/ev_root_ca_metadata.cc
index 30c37bb..4f3b196 100644
--- a/net/base/ev_root_ca_metadata.cc
+++ b/net/base/ev_root_ca_metadata.cc
@@ -184,7 +184,7 @@ EVRootCAMetadata::EVRootCAMetadata() {
// Constructs the object from the raw metadata in ev_root_ca_metadata.
num_policy_oids_ = arraysize(ev_root_ca_metadata);
policy_oids_.reset(new const char*[num_policy_oids_]);
- for (int i = 0; i < arraysize(ev_root_ca_metadata); i++) {
+ for (size_t i = 0; i < arraysize(ev_root_ca_metadata); i++) {
const EVMetadata& metadata = ev_root_ca_metadata[i];
ev_policy_[metadata.fingerprint] = metadata.policy_oid;
// Multiple root CA certs may use the same EV policy OID. Having
diff --git a/net/base/ev_root_ca_metadata.h b/net/base/ev_root_ca_metadata.h
index 8e83f0c..0ebba6c 100644
--- a/net/base/ev_root_ca_metadata.h
+++ b/net/base/ev_root_ca_metadata.h
@@ -58,7 +58,7 @@ class EVRootCAMetadata {
EVRootCAMetadata();
~EVRootCAMetadata() { }
- friend DefaultSingletonTraits<EVRootCAMetadata>;
+ friend class DefaultSingletonTraits<EVRootCAMetadata>;
typedef std::map<X509Certificate::Fingerprint, std::string,
X509Certificate::FingerprintLessThan> StringMap;
diff --git a/net/net.xcodeproj/project.pbxproj b/net/net.xcodeproj/project.pbxproj
index f10431a..e3e17c2 100644
--- a/net/net.xcodeproj/project.pbxproj
+++ b/net/net.xcodeproj/project.pbxproj
@@ -81,6 +81,7 @@
7BED34190E5A1A8600A747DB /* libnet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4BA04540E25613300BE02C6 /* libnet.a */; };
7BED34450E5A1A9600A747DB /* libbase.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BED324A0E5A17C000A747DB /* libbase.a */; };
7BED34520E5A1ABC00A747DB /* libgtest.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7BED32530E5A17C300A747DB /* libgtest.a */; };
+ 825C2FCC0E5C968B00FDEAB7 /* ev_root_ca_metadata.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32BE0E5A181C00A747DB /* ev_root_ca_metadata.cc */; };
82ECB3090E5B651D00A913E3 /* mime_sniffer.cc in Sources */ = {isa = PBXBuildFile; fileRef = 7BED32AD0E5A181C00A747DB /* mime_sniffer.cc */; };
E4AFA6430E5241B400201347 /* run_all_unittests.cc in Sources */ = {isa = PBXBuildFile; fileRef = E4AFA6420E5241B400201347 /* run_all_unittests.cc */; };
/* End PBXBuildFile section */
@@ -1171,6 +1172,7 @@
7B85040D0E5B2DD800730B43 /* data_url.cc in Sources */,
7B8504100E5B2DF000730B43 /* entry_impl.cc in Sources */,
7B8504120E5B2DF000730B43 /* escape.cc in Sources */,
+ 825C2FCC0E5C968B00FDEAB7 /* ev_root_ca_metadata.cc in Sources */,
7B8504140E5B2DF000730B43 /* file_lock.cc in Sources */,
7B8504150E5B2DF000730B43 /* file_posix.cc in Sources */,
7BA0154C0E5A1C0400044150 /* filter.cc in Sources */,