| Index: net/http/http_security_headers_unittest.cc
|
| diff --git a/net/http/http_security_headers_unittest.cc b/net/http/http_security_headers_unittest.cc
|
| index adb8fd69458f1d9a66e246d0d40c1ed426e3469a..62c6b2fb6e277684494004dca9f8c41a0bf81ed6 100644
|
| --- a/net/http/http_security_headers_unittest.cc
|
| +++ b/net/http/http_security_headers_unittest.cc
|
| @@ -619,7 +619,8 @@ TEST_F(HttpSecurityHeadersTest, UpdateDynamicPKPOnly) {
|
| std::string failure_log;
|
| const bool is_issued_by_known_root = true;
|
| EXPECT_TRUE(state.CheckPublicKeyPins(
|
| - domain, is_issued_by_known_root, hashes, &failure_log));
|
| + domain, is_issued_by_known_root, hashes, 0, nullptr, nullptr,
|
| + TransportSecurityState::DO_NOT_SEND_PUBLIC_KEY_PIN_REPORT, &failure_log));
|
|
|
| TransportSecurityState::DomainState new_dynamic_domain_state;
|
| EXPECT_TRUE(state.GetDynamicDomainState(domain, &new_dynamic_domain_state));
|
| @@ -709,11 +710,10 @@ TEST_F(HttpSecurityHeadersTest, UpdateDynamicPKPMaxAge0) {
|
| new_static_domain_state2.pkp.spki_hashes[1].data()[0] ^= 0x80;
|
| new_static_domain_state2.pkp.spki_hashes[2].data()[0] ^= 0x80;
|
| const bool is_issued_by_known_root = true;
|
| - EXPECT_FALSE(
|
| - state.CheckPublicKeyPins(domain,
|
| - is_issued_by_known_root,
|
| - new_static_domain_state2.pkp.spki_hashes,
|
| - &failure_log));
|
| + EXPECT_FALSE(state.CheckPublicKeyPins(
|
| + domain, is_issued_by_known_root, new_static_domain_state2.pkp.spki_hashes,
|
| + 0, nullptr, nullptr,
|
| + TransportSecurityState::DO_NOT_SEND_PUBLIC_KEY_PIN_REPORT, &failure_log));
|
| EXPECT_NE(0UL, failure_log.length());
|
| }
|
|
|
| @@ -744,10 +744,9 @@ TEST_F(HttpSecurityHeadersTest, NoClobberPins) {
|
| EXPECT_TRUE(state.ShouldUpgradeToSSL(domain));
|
| std::string failure_log;
|
| const bool is_issued_by_known_root = true;
|
| - EXPECT_TRUE(state.CheckPublicKeyPins(domain,
|
| - is_issued_by_known_root,
|
| - saved_hashes,
|
| - &failure_log));
|
| + EXPECT_TRUE(state.CheckPublicKeyPins(
|
| + domain, is_issued_by_known_root, saved_hashes, 0, nullptr, nullptr,
|
| + TransportSecurityState::DO_NOT_SEND_PUBLIC_KEY_PIN_REPORT, &failure_log));
|
|
|
| // Add an HPKP header, which should only update the dynamic state.
|
| HashValue good_hash = GetTestHashValue(1, HASH_VALUE_SHA1);
|
| @@ -767,10 +766,9 @@ TEST_F(HttpSecurityHeadersTest, NoClobberPins) {
|
| EXPECT_TRUE(state.ShouldUpgradeToSSL(domain));
|
| // The dynamic pins, which do not match |saved_hashes|, should take
|
| // precedence over the static pins and cause the check to fail.
|
| - EXPECT_FALSE(state.CheckPublicKeyPins(domain,
|
| - is_issued_by_known_root,
|
| - saved_hashes,
|
| - &failure_log));
|
| + EXPECT_FALSE(state.CheckPublicKeyPins(
|
| + domain, is_issued_by_known_root, saved_hashes, 0, nullptr, nullptr,
|
| + TransportSecurityState::DO_NOT_SEND_PUBLIC_KEY_PIN_REPORT, &failure_log));
|
| }
|
|
|
| // Tests that seeing an invalid HPKP header leaves the existing one alone.
|
| @@ -794,9 +792,10 @@ TEST_F(HttpSecurityHeadersTest, IgnoreInvalidHeaders) {
|
| EXPECT_TRUE(state.HasPublicKeyPins("example.com"));
|
| std::string failure_log;
|
| bool is_issued_by_known_root = true;
|
| - EXPECT_TRUE(state.CheckPublicKeyPins("example.com", is_issued_by_known_root,
|
| - ssl_info.public_key_hashes,
|
| - &failure_log));
|
| + EXPECT_TRUE(state.CheckPublicKeyPins(
|
| + "example.com", is_issued_by_known_root, ssl_info.public_key_hashes, 0,
|
| + nullptr, nullptr,
|
| + TransportSecurityState::DO_NOT_SEND_PUBLIC_KEY_PIN_REPORT, &failure_log));
|
|
|
| // Now assert an invalid one. This should fail.
|
| EXPECT_FALSE(state.AddHPKPHeader(
|
| @@ -805,9 +804,10 @@ TEST_F(HttpSecurityHeadersTest, IgnoreInvalidHeaders) {
|
|
|
| // The old pins must still exist.
|
| EXPECT_TRUE(state.HasPublicKeyPins("example.com"));
|
| - EXPECT_TRUE(state.CheckPublicKeyPins("example.com", is_issued_by_known_root,
|
| - ssl_info.public_key_hashes,
|
| - &failure_log));
|
| + EXPECT_TRUE(state.CheckPublicKeyPins(
|
| + "example.com", is_issued_by_known_root, ssl_info.public_key_hashes, 0,
|
| + nullptr, nullptr,
|
| + TransportSecurityState::DO_NOT_SEND_PUBLIC_KEY_PIN_REPORT, &failure_log));
|
| }
|
|
|
| }; // namespace net
|
|
|