Bug 1016442 - Make mozilla cdn sites production on built-in list. r=mmc

--HG--
extra : rebase_source : 5d937b61ab86c974210dcc83735cd4308bff018e
This commit is contained in:
Camilo Viecco 2014-05-27 10:53:40 -07:00
Родитель 96e2ce765d
Коммит b07e3b1b23
2 изменённых файлов: 7 добавлений и 7 удалений

Просмотреть файл

@ -672,8 +672,8 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
{ "aus4.mozilla.org", true, true, true, 3, &kPinset_mozilla },
{ "blog.torproject.org", true, true, false, -1, &kPinset_tor },
{ "business.twitter.com", true, false, false, -1, &kPinset_twitterCom },
{ "cdn.mozilla.net", true, true, true, -1, &kPinset_mozilla },
{ "cdn.mozilla.org", true, true, true, -1, &kPinset_mozilla },
{ "cdn.mozilla.net", true, false, true, -1, &kPinset_mozilla },
{ "cdn.mozilla.org", true, false, true, -1, &kPinset_mozilla },
{ "chart.apis.google.com", true, true, false, -1, &kPinset_google_root_pems },
{ "check.torproject.org", true, true, false, -1, &kPinset_tor },
{ "checkout.google.com", true, true, false, -1, &kPinset_google_root_pems },
@ -936,7 +936,7 @@ static const TransportSecurityPreload kPublicKeyPinningPreloadList[] = {
{ "liberty.lavabit.com", true, true, false, -1, &kPinset_lavabit },
{ "mail.google.com", true, true, false, -1, &kPinset_google_root_pems },
{ "market.android.com", true, true, false, -1, &kPinset_google_root_pems },
{ "media.mozilla.com", true, true, true, -1, &kPinset_mozilla },
{ "media.mozilla.com", true, false, true, -1, &kPinset_mozilla },
{ "mobile.twitter.com", true, false, false, -1, &kPinset_twitterCom },
{ "oauth.twitter.com", true, false, false, -1, &kPinset_twitterCom },
{ "pinningtest.appspot.com", true, false, false, -1, &kPinset_test },
@ -988,4 +988,4 @@ static const int kPublicKeyPinningPreloadListLength = 322;
static const int32_t kUnknownId = -1;
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1411681083658000);
static const PRTime kPreloadPKPinsExpirationTime = INT64_C(1412099175458000);

Просмотреть файл

@ -177,11 +177,11 @@
{ "name": "aus4.mozilla.org", "include_subdomains": true,
"pins": "mozilla", "test_mode": true, "id": 3 },
{ "name": "cdn.mozilla.net", "include_subdomains": true,
"pins": "mozilla", "test_mode": true},
"pins": "mozilla", "test_mode": false },
{ "name": "cdn.mozilla.org", "include_subdomains": true,
"pins": "mozilla", "test_mode": true },
"pins": "mozilla", "test_mode": false },
{ "name": "media.mozilla.com", "include_subdomains": true,
"pins": "mozilla", "test_mode": true },
"pins": "mozilla", "test_mode": false },
{ "name": "include-subdomains.pinning.example.com",
"include_subdomains": true, "pins": "mozilla_test",
"test_mode": false },