Bug 1019772: Enable production mode on pinning AMO (r=keeler)

This commit is contained in:
Monica Chew 2014-06-03 11:00:39 -07:00
parent 7d6eb03f73
commit 2c499987c0
2 changed files with 5 additions and 5 deletions

View File

@ -661,8 +661,8 @@ struct TransportSecurityPreload {
/* Sort hostnames for binary search. */
static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
{ "accounts.google.com", true, true, false, -1, &kPinset_google_root_pems },
{ "addons.mozilla.net", true, true, true, 2, &kPinset_mozilla },
{ "addons.mozilla.org", true, true, true, 1, &kPinset_mozilla },
{ "addons.mozilla.net", true, false, true, 2, &kPinset_mozilla },
{ "addons.mozilla.org", true, false, true, 1, &kPinset_mozilla },
{ "admin.google.com", true, true, false, -1, &kPinset_google_root_pems },
{ "android.com", true, true, false, -1, &kPinset_google_root_pems },
{ "api.twitter.com", true, false, false, -1, &kPinset_twitterCDN },
@ -988,4 +988,4 @@ static const int kPublicKeyPinningPreloadListLength = 322;
static const int32_t kUnknownId = -1;
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1412099175458000);
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1412704831237000);

View File

@ -171,9 +171,9 @@
// Only domains that are operationally crucial to Firefox can have per-host
// telemetry reporting (the "id") field
{ "name": "addons.mozilla.org", "include_subdomains": true,
"pins": "mozilla", "test_mode": true, "id": 1 },
"pins": "mozilla", "test_mode": false, "id": 1 },
{ "name": "addons.mozilla.net", "include_subdomains": true,
"pins": "mozilla", "test_mode": true, "id": 2 },
"pins": "mozilla", "test_mode": false, "id": 2 },
{ "name": "aus4.mozilla.org", "include_subdomains": true,
"pins": "mozilla", "test_mode": true, "id": 3 },
{ "name": "cdn.mozilla.net", "include_subdomains": true,