summaryrefslogtreecommitdiffstats
path: root/net/base/ssl_info.h
diff options
context:
space:
mode:
authorpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-06 19:04:21 +0000
committerpalmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-06 19:04:21 +0000
commita7c2609a96d01f2d5f9cecd15ddc55869e8c6a75 (patch)
tree6a2b69b0160fd4c77dbf1a91af54c48c023eb2af /net/base/ssl_info.h
parent9939d35f9827ed0929646607cbdb071af627ac38 (diff)
downloadchromium_src-a7c2609a96d01f2d5f9cecd15ddc55869e8c6a75.zip
chromium_src-a7c2609a96d01f2d5f9cecd15ddc55869e8c6a75.tar.gz
chromium_src-a7c2609a96d01f2d5f9cecd15ddc55869e8c6a75.tar.bz2
Implement SHA-256 fingerprint support.
The HTTP-based Public Key Pinning Internet Draft (tools.ietf.org/html/draft-ietf-websec-key-pinning) requires this. Per wtc, give the *Fingeprint* types more meaningful *HashValue* names. Cleaning up lint along the way. This CL reverts 149268, which reverted 149261 the previous version of this CL. It includes a fix to the compile problem that necessitated 149268. BUG=117914 TEST=net_unittests, unit_tests TransportSecurityPersisterTest Review URL: https://chromiumcodereview.appspot.com/10836062 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/ssl_info.h')
-rw-r--r--net/base/ssl_info.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/net/base/ssl_info.h b/net/base/ssl_info.h
index b3c37d2..e9c6ea5 100644
--- a/net/base/ssl_info.h
+++ b/net/base/ssl_info.h
@@ -71,8 +71,11 @@ class NET_EXPORT SSLInfo {
HandshakeType handshake_type;
- // The hashes of the SubjectPublicKeyInfos from each certificate in the chain.
- std::vector<SHA1Fingerprint> public_key_hashes;
+ // The hashes of the SubjectPublicKeyInfos from each certificate in the
+ // chain. This is a vector of vectors: Index the outer vector with
+ // FingerprintTag, and then the inner HashValueVectors will be
+ // fingerprints made with the algorithm named by the FingerprintTag.
+ std::vector<HashValueVector> public_key_hashes;
};
} // namespace net