diff options
| author | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-07 19:51:20 +0000 |
|---|---|---|
| committer | cevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-07 19:51:20 +0000 |
| commit | e02a003ad361b3d8132d43a653dfce9c2bd52d0e (patch) | |
| tree | f0bdcfa4f8c16856287dd6ed64e2f12e8103cc0f /net | |
| parent | c3024df49ee1f054f2018c2cd87eba3e0da1a59d (diff) | |
| download | chromium_src-e02a003ad361b3d8132d43a653dfce9c2bd52d0e.zip chromium_src-e02a003ad361b3d8132d43a653dfce9c2bd52d0e.tar.gz chromium_src-e02a003ad361b3d8132d43a653dfce9c2bd52d0e.tar.bz2 | |
Remove special case hack for *.latest.chrome.google.com now that --hsts-hosts
can override things.
Review URL: http://codereview.chromium.org/7058053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/base/transport_security_state.cc | 2 | ||||
| -rw-r--r-- | net/base/transport_security_state_unittest.cc | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc index ffab1d7..8d6d885 100644 --- a/net/base/transport_security_state.cc +++ b/net/base/transport_security_state.cc @@ -578,7 +578,6 @@ bool TransportSecurityState::IsPreloadedSTS( {19, true, "\006health\006google\003com", true, kGoogleAcceptableCerts }, {21, true, "\010checkout\006google\003com", true, kGoogleAcceptableCerts }, {19, true, "\006chrome\006google\003com", true, kGoogleAcceptableCerts }, - {26, false, "\006latest\006chrome\006google\003com", true, 0 }, {17, true, "\004docs\006google\003com", true, kGoogleAcceptableCerts }, {18, true, "\005sites\006google\003com", true, kGoogleAcceptableCerts }, {25, true, "\014spreadsheets\006google\003com", true, @@ -594,6 +593,7 @@ bool TransportSecurityState::IsPreloadedSTS( {17, true, "\004talk\006google\003com", true, kGoogleAcceptableCerts }, {29, true, "\020hostedtalkgadget\006google\003com", true, kGoogleAcceptableCerts }, + {17, true, "\004plus\006google\003com", true, kGoogleAcceptableCerts }, // Other Google-related domains that must use HTTPS. {20, true, "\006market\007android\003com", true, kGoogleAcceptableCerts }, {26, true, "\003ssl\020google-analytics\003com", true, diff --git a/net/base/transport_security_state_unittest.cc b/net/base/transport_security_state_unittest.cc index c28b60a..b236327 100644 --- a/net/base/transport_security_state_unittest.cc +++ b/net/base/transport_security_state_unittest.cc @@ -431,12 +431,6 @@ TEST_F(TransportSecurityStateTest, Preloaded) { EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "chrome.google.com", true)); - EXPECT_FALSE(state->IsEnabledForHost(&domain_state, - "foo.latest.chrome.google.com", - true)); - EXPECT_TRUE(state->IsEnabledForHost(&domain_state, - "latest.chrome.google.com", - true)); EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "checkout.google.com", true)); @@ -501,6 +495,7 @@ TEST_F(TransportSecurityStateTest, Preloaded) { "hostedtalkgadget.google.com", true)); EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "talk.google.com", true)); + EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "plus.google.com", true)); EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "entropia.de", true)); EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "www.entropia.de", true)); @@ -714,6 +709,7 @@ TEST_F(TransportSecurityStateTest, BuiltinCertPins) { "hostedtalkgadget.google.com", true)); EXPECT_TRUE(state->HasPinsForHost(&domain_state, "talk.google.com", true)); + EXPECT_TRUE(state->HasPinsForHost(&domain_state, "plus.google.com", true)); EXPECT_TRUE(state->HasPinsForHost(&domain_state, "ssl.gstatic.com", true)); EXPECT_FALSE(state->HasPinsForHost(&domain_state, "www.gstatic.com", true)); EXPECT_TRUE(state->HasPinsForHost(&domain_state, |