Bug 1027133: Set test_mode=false for *.twitter.com (r=keeler)
authorMonica Chew <mmc@mozilla.com>
Mon, 07 Jul 2014 08:58:13 -0700
changeset 192687 fdc900ad296f1cdf849d51b633f135ace7ecb288
parent 192686 7e8fac17305a09e1671b1bb01384b7b5b616110f
child 192688 a5d6027756ae1f19046bc52ba92faec97e582e65
push idunknown
push userunknown
push dateunknown
reviewerskeeler
bugs1027133
milestone33.0a1
Bug 1027133: Set test_mode=false for *.twitter.com (r=keeler)
security/manager/boot/src/StaticHPKPins.h
security/manager/tools/PreloadedHPKPins.json
--- a/security/manager/boot/src/StaticHPKPins.h
+++ b/security/manager/boot/src/StaticHPKPins.h
@@ -999,17 +999,17 @@ static const TransportSecurityPreload kP
   { "ssl.google-analytics.com", true, false, false, -1, &kPinset_google_root_pems },
   { "talk.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "talkgadget.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "test-mode.pinning.example.com", true, true, false, -1, &kPinset_mozilla_test },
   { "tor2web.org", true, true, false, -1, &kPinset_tor2web },
   { "torproject.org", false, true, false, -1, &kPinset_tor },
   { "translate.googleapis.com", true, false, false, -1, &kPinset_google_root_pems },
   { "twimg.com", true, false, false, -1, &kPinset_twitterCDN },
-  { "twitter.com", true, true, false, -1, &kPinset_twitterCDN },
+  { "twitter.com", true, false, false, -1, &kPinset_twitterCDN },
   { "urchin.com", true, false, false, -1, &kPinset_google_root_pems },
   { "w-spotlight.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "wallet.google.com", true, false, false, -1, &kPinset_google_root_pems },
   { "webfilings-eu-mirror.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "webfilings-eu.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "webfilings-mirror-hrd.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "webfilings.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
   { "wf-bigsky-master.appspot.com", true, false, false, -1, &kPinset_google_root_pems },
--- a/security/manager/tools/PreloadedHPKPins.json
+++ b/security/manager/tools/PreloadedHPKPins.json
@@ -206,11 +206,11 @@
       "include_subdomains": false, "pins": "mozilla_test",
       "test_mode": false, "id": 0 },
     { "name": "test-mode.pinning.example.com", "include_subdomains": true,
       "pins": "mozilla_test", "test_mode": true },
     // Expand twitter's pinset to include all of *.twitter.com and use
     // twitterCDN. More specific rules take precedence because we search for
     // exact domain name first.
     { "name": "twitter.com", "include_subdomains": true,
-      "pins": "twitterCDN", "test_mode": true }
+      "pins": "twitterCDN", "test_mode": false }
   ]
 }