summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 01:52:33 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 01:52:33 +0000
commit413eb8709a131c09ad425f344e9a0eb200674393 (patch)
treec281a62bcbeefe5206410827eb49ed6aca300c14 /net
parentbe688adaaf4a4180debd6b52261e8a1f550fbcac (diff)
downloadchromium_src-413eb8709a131c09ad425f344e9a0eb200674393.zip
chromium_src-413eb8709a131c09ad425f344e9a0eb200674393.tar.gz
chromium_src-413eb8709a131c09ad425f344e9a0eb200674393.tar.bz2
Add profiles.google.com to HSTS list, with permission.
Review URL: http://codereview.chromium.org/6913015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83838 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/transport_security_state.cc1
-rw-r--r--net/base/transport_security_state_unittest.cc6
2 files changed, 7 insertions, 0 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index dcb0a3d..1a62669 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -591,6 +591,7 @@ bool TransportSecurityState::IsPreloadedSTS(
kGoogleAcceptableCerts },
{22, true, "\011encrypted\006google\003com", true, kGoogleAcceptableCerts },
{21, true, "\010accounts\006google\003com", true, kGoogleAcceptableCerts },
+ {21, true, "\010profiles\006google\003com", true, kGoogleAcceptableCerts },
#if defined(OS_CHROMEOS)
// TODO(cevans) - unify this with Chrome.
{17, true, "\004mail\006google\003com", true, kGoogleAcceptableCerts },
diff --git a/net/base/transport_security_state_unittest.cc b/net/base/transport_security_state_unittest.cc
index 8c09414..ebc2f7c 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -487,6 +487,9 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
"accounts.google.com",
true));
+ EXPECT_TRUE(state->IsEnabledForHost(&domain_state,
+ "profiles.google.com",
+ true));
EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "entropia.de", true));
EXPECT_TRUE(state->IsEnabledForHost(&domain_state, "www.entropia.de", true));
@@ -627,6 +630,9 @@ TEST_F(TransportSecurityStateTest, BuiltinCertPins) {
EXPECT_TRUE(state->HasPinsForHost(&domain_state,
"accounts.google.com",
true));
+ EXPECT_TRUE(state->HasPinsForHost(&domain_state,
+ "profiles.google.com",
+ true));
EXPECT_TRUE(state->HasPinsForHost(&domain_state, "ssl.gstatic.com", true));
EXPECT_TRUE(state->HasPinsForHost(&domain_state,
"ssl.google-analytics.com",