diff options
author | palmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 19:04:21 +0000 |
---|---|---|
committer | palmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 19:04:21 +0000 |
commit | a7c2609a96d01f2d5f9cecd15ddc55869e8c6a75 (patch) | |
tree | 6a2b69b0160fd4c77dbf1a91af54c48c023eb2af /net/url_request | |
parent | 9939d35f9827ed0929646607cbdb071af627ac38 (diff) | |
download | chromium_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/url_request')
-rw-r--r-- | net/url_request/url_request_unittest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc index 0178d37..3d785e9 100644 --- a/net/url_request/url_request_unittest.cc +++ b/net/url_request/url_request_unittest.cc @@ -147,7 +147,7 @@ void CheckSSLInfo(const SSLInfo& ssl_info) { EXPECT_NE(0, cipher_suite); } -bool FingerprintsEqual(const FingerprintVector& a, const FingerprintVector& b) { +bool FingerprintsEqual(const HashValueVector& a, const HashValueVector& b) { size_t size = a.size(); if (size != b.size()) @@ -550,7 +550,7 @@ class URLRequestTestHTTP : public URLRequestTest { strlen(expected_data))); } - bool DoManyCookiesRequest(int num_cookies){ + bool DoManyCookiesRequest(int num_cookies) { TestDelegate d; URLRequest r(test_server_.GetURL("set-many-cookies?" + base::IntToString(num_cookies)), @@ -564,7 +564,7 @@ class URLRequestTestHTTP : public URLRequestTest { bool is_success = r.status().is_success(); - if (!is_success){ + if (!is_success) { // Requests handled by ChromeFrame send a less precise error message, // ERR_CONNECTION_ABORTED. EXPECT_TRUE(r.status().error() == ERR_RESPONSE_HEADERS_TOO_BIG || @@ -1473,7 +1473,7 @@ class TestSSLConfigService : public SSLConfigService { // This the fingerprint of the "Testing CA" certificate used by the testserver. // See net/data/ssl/certificates/ocsp-test-root.pem. -static const SHA1Fingerprint kOCSPTestCertFingerprint = +static const SHA1HashValue kOCSPTestCertFingerprint = { { 0xf1, 0xad, 0xf6, 0xce, 0x42, 0xac, 0xe7, 0xb4, 0xf4, 0x24, 0xdb, 0x1a, 0xf7, 0xa0, 0x9f, 0x09, 0xa1, 0xea, 0xf1, 0x5c } }; |