Граф коммитов

11417 Коммитов

Автор SHA1 Сообщение Дата
Wes Kocher 2ea6238e55 Merge inbound to central, a=merge
MozReview-Commit-ID: 6od53T3ozcm
2017-03-23 16:15:37 -07:00
ffxbld e21d1dde53 No bug, Automated HPKP preload list update from host bld-linux64-spot-388 - a=hpkp-update 2017-03-23 07:49:00 -07:00
ffxbld 4458112d90 No bug, Automated HSTS preload list update from host bld-linux64-spot-388 - a=hsts-update 2017-03-23 07:48:58 -07:00
Bob Owen b99c6e7ae0 Bug 1337331 Part 6: Re-apply - Change USER_NON_ADMIN access token level from whitelist to blacklist containing Admin SIDs. r=jimm
Carrying r=jimm from original changeset:
https://hg.mozilla.org/mozilla-central/rev/0e6bf137521e

MozReview-Commit-ID: ExTtkUIPXH8
2017-03-23 10:29:05 +00:00
ffxbld 71d521184f No bug, Automated HPKP preload list update from host bld-linux64-spot-388 - a=hpkp-update 2017-03-22 07:50:19 -07:00
ffxbld cebf9f4e25 No bug, Automated HSTS preload list update from host bld-linux64-spot-388 - a=hsts-update 2017-03-22 07:50:16 -07:00
Mark Banner d7d8be9285 Bug 1347712 - Move toolkit/.eslintrc.js rules into a 'recommended' set within eslint-plugin-mozilla. r=jaws
MozReview-Commit-ID: Jy4apKnmWcV

--HG--
rename : toolkit/.eslintrc.js => tools/lint/eslint/eslint-plugin-mozilla/lib/configs/recommended.js
extra : rebase_source : ae0c740c1c2a9cf620c1ac34024622ade12e6fd4
2017-03-22 10:43:00 +01:00
Mark Banner bd625e4e9f Bug 1347712 - Change the testing configurations into ESLint configurations within eslint-plugin-mozilla - automatically update .eslintrc.js test config files for new config locations. r=jaws
MozReview-Commit-ID: LH0CQOPfoe6

--HG--
extra : rebase_source : 83eaf40c5cbb5e25cfb3f3b5afadf4fbf0422c92
2017-03-20 12:36:37 +01:00
Wes Kocher 9a54a919a0 Merge m-c to autoland, a=merge
MozReview-Commit-ID: 2LT2oEKZno8
2017-03-21 16:20:49 -07:00
ffxbld 06c4675584 No bug, Automated HPKP preload list update from host bld-linux64-spot-094 - a=hpkp-update 2017-03-21 08:22:11 -07:00
ffxbld eb520767a4 No bug, Automated HSTS preload list update from host bld-linux64-spot-094 - a=hsts-update 2017-03-21 08:22:08 -07:00
ffxbld ee7cfd05d7 No bug, Automated HPKP preload list update from host bld-linux64-spot-036 - a=hpkp-update 2017-03-20 08:25:08 -07:00
ffxbld e5d6472d23 No bug, Automated HSTS preload list update from host bld-linux64-spot-036 - a=hsts-update 2017-03-20 08:25:05 -07:00
David Keeler 39eddacacc bug 1344478 - isAlreadyShutDown should return true for nsNSSShutDownObjects created after NSS shut down r=Cykesiopka,ttaubert
MozReview-Commit-ID: 5bUTLz6mGKC

In general, it is possible to create a new nsNSSShutDownObject after
nsNSSShutDownList::shutdown() had been called. Before this patch, at that point,
isAlreadyShutDown() would incorrectly return false, which could lead to code
calling NSS functions, which would probably lead to a crash (because NSS could
be uninitialized at that point). This change merges
nsNSSShutDownList::shutdown() with evaporateAllNSSResources() into
evaporateAllNSSResourcesAndShutDown() for simplicity and makes it so
isAlreadyShutDown() returns true if called after that point.

--HG--
extra : rebase_source : badab89a9e197f18fcd943f16cc77c6aa6664f0d
2017-03-13 15:26:40 -07:00
David Keeler 82a2ae61a8 bug 1348713 - ensure CT information is set in the case of session resumption r=jcj
MozReview-Commit-ID: 7fLnMu9f1kC

--HG--
extra : rebase_source : ca5ccbf40b715bb0c9d6869da3820e55c7564df5
2017-03-20 17:10:33 -07:00
Franziskus Kiefer 5a25c3f857 Bug 1345368 - land NSS d621b1e53054, r=me
--HG--
extra : rebase_source : 3030e2bdde664359d725bda01379c858492b7686
2017-03-20 06:02:00 +01:00
ffxbld cd43949ff3 No bug, Automated HPKP preload list update from host bld-linux64-spot-022 - a=hpkp-update 2017-03-19 08:13:10 -07:00
ffxbld 076dd6fc40 No bug, Automated HSTS preload list update from host bld-linux64-spot-022 - a=hsts-update 2017-03-19 08:13:07 -07:00
Sebastian Hengst b65c89dc29 merge autoland to mozilla-central. r=merge a=merge
MozReview-Commit-ID: LKBh8rimLx2
2017-03-18 16:16:20 +01:00
ffxbld ce7c4bf1e0 No bug, Automated HPKP preload list update from host bld-linux64-spot-022 - a=hpkp-update 2017-03-18 08:07:40 -07:00
ffxbld 3b9e9a6e0f No bug, Automated HSTS preload list update from host bld-linux64-spot-022 - a=hsts-update 2017-03-18 08:07:37 -07:00
Wes Kocher ee28f4ee71 Merge inbound to central, a=merge
MozReview-Commit-ID: Fq7B78wD7Wv
2017-03-17 11:03:59 -07:00
ffxbld c2a60adfc7 No bug, Automated HPKP preload list update from host bld-linux64-spot-302 - a=hpkp-update 2017-03-17 08:38:33 -07:00
ffxbld 21a93c9f95 No bug, Automated HSTS preload list update from host bld-linux64-spot-302 - a=hsts-update 2017-03-17 08:38:31 -07:00
Carsten "Tomcat" Book 3e0a5441c6 Merge mozilla-central to mozilla-inbound 2017-03-17 14:55:15 +01:00
Franziskus Kiefer deb6b3311d Bug 1345368 - land NSS 37ccb22f8e51, r=me
--HG--
extra : rebase_source : 9e311a3410733d0db12818c57542c8321b8fddad
2017-03-17 06:01:56 +01:00
Jonathan Kew 17d57d21e1 Bug 1340351 - Allow sandboxed content process on macOS to access fonts synced by Adobe Creative Cloud. r=haik 2017-03-16 22:26:43 +00:00
Wes Kocher 653e4de273 Merge autoland to central, a=merge
MozReview-Commit-ID: EeBZDKaZKly
2017-03-16 13:38:47 -07:00
ffxbld 006005beff No bug, Automated HPKP preload list update from host bld-linux64-spot-308 - a=hpkp-update 2017-03-16 07:57:12 -07:00
ffxbld d003925309 No bug, Automated HSTS preload list update from host bld-linux64-spot-308 - a=hsts-update 2017-03-16 07:57:09 -07:00
Carsten "Tomcat" Book 468f7d8e9f merge mozilla-inbound to mozilla-central a=merge 2017-03-16 15:35:50 +01:00
flyingrub a8f1cea361 Bug 1346299 - Remove Telemetry Probe: KEYGEN_GENERATED_KEY_TYPE r=jcj,keeler
Removed the probe in Histogram.json and the code related to it in nsKeygenHandler.cpp

MozReview-Commit-ID: E8lGbx19e2C

--HG--
extra : rebase_source : ef958749e6ad2e2b617fd1efdd09cdd3185bef18
2017-03-14 11:54:57 +01:00
David Keeler 8c5524fc2e bug 1339921 - disable clang's shadowed field warning in a mozilla::pkix gtest class r=Cykesiopka,dholbert
pkixocsp_VerifyEncodedResponse_GetCertTrust has a field trustDomain that
deliberately shadows the field it inherits from so that code doesn't use it by
accident.

MozReview-Commit-ID: 1Y4W6sA7lHD

--HG--
extra : rebase_source : d2d3180e6c65ea49255545216230525b96af010d
2017-03-14 15:58:04 -07:00
Cykesiopka 7995951109 Bug 1338897 - Avoid using NSS Base64 functions in PSM. r=keeler
The NSS Base64 functions are less safe and convenient to use than the XPCOM ones.
They're also an unnecessary dependency on NSS.

The NSS Base64 functions behave slightly differently than the XPCOM ones:
1. ATOB_ConvertAsciiToItem() / NSSBase64_DecodeBuffer() silently ignore invalid
   characters like CRLF, space and so on. Base64Decode() will return an error
   if these characters are encountered.
2. BTOA_DataToAscii() will produce output that has CRLF inserted every 64
   characters. Base64Encode() doesn't do this.

For the reasons listed below, no unexpected compatibility issues should arise:
1. AppSignatureVerification.cpp already filters out CRLF and spaces for Manifest
   and Signature values before decoding.
2. ExtendedValidation.cpp is only given what should be valid hard-coded input to
   decode.
3. ContentSignatureVerifier.cpp already splits on CRLF for when it needs to
   decode PEM certs. Spaces shouldn't be likely.
   For Content-Signature header verification, examination of real input to a
   running instance of Firefox suggests CRLF and spaces will not be present in
   the header to decode.
4. nsCryptoHash.cpp encode is affected, but we actually don't want the CRLF
   behaviour.
5. nsDataSignatureVerifier.cpp decode is affected, but we add whitespace
   stripping to maintain backwards compatibility.
6. nsKeygenHandler.cpp encode is affected, but the previous CRLF behaviour was
   arguably a bug, since neither WHATWG or W3C specs specified this.

MozReview-Commit-ID: IWMFxqVZMeX

--HG--
extra : rebase_source : 4863b2e5eabef0555e8e1ebe39216d0d9393f3e9
2017-03-17 23:31:40 +08:00
Wes Kocher 1b3ffba4d5 Merge m-c to autoland, a=merge
MozReview-Commit-ID: CtdOO1SeODv
2017-03-16 14:07:44 -07:00
David Major ed12ea611f Bug 1346078: Remove nsAString_internal and just use the nsAString name directly. r=bsmedberg
MozReview-Commit-ID: DWDEDMIVKm7

--HG--
extra : rebase_source : 7fe8dc07c816dca234c67761e61cdee372a87e97
2017-03-10 15:17:23 +13:00
ffxbld 0aeaee1eb9 No bug, Automated HPKP preload list update from host bld-linux64-spot-038 - a=hpkp-update 2017-03-15 08:12:33 -07:00
ffxbld 00c6b3b68c No bug, Automated HSTS preload list update from host bld-linux64-spot-038 - a=hsts-update 2017-03-15 08:12:30 -07:00
Wes Kocher 0902d5e08e Merge m-c to inbound, a=merge
MozReview-Commit-ID: AzYu7EXTIlg
2017-03-14 17:23:26 -07:00
ffxbld ca7015fa45 No bug, Automated HPKP preload list update from host bld-linux64-spot-032 - a=hpkp-update 2017-03-14 08:14:06 -07:00
ffxbld 9f405f7b6e No bug, Automated HSTS preload list update from host bld-linux64-spot-032 - a=hsts-update 2017-03-14 08:14:03 -07:00
Ehsan Akhgari 99f016e209 Bug 1346486 - Add a memory reporter for PSM DataStorage caches; r=keeler 2017-03-14 14:34:30 -04:00
Jim Porter 5e6b22bdde Bug 1346671 - Enable the no-useless-concat eslint rule in toolkit/ r=jaws
MozReview-Commit-ID: 1a422BiLEhK

--HG--
extra : rebase_source : a83b8d753e2a48593904ef0755d5517908588b93
2017-03-13 17:34:24 -05:00
David Major dc67bfc9a3 Bug 1344629 - Part 6: Rewrite unnecessary uses of nsLiteralString. r=dbaron
There's an antipattern where nsLiteralString is used as an unnecessary intermediary in converting from CharT* to CharT*,
e.g. CallAFunctionThatTakesACharPointer(NS_LITERAL_CSTRING("foo").get());
or
NS_NAMED_LITERAL_STRING(foo, "abc");
CallAFunctionThatTakesACharPointer(foo.get());

This patch rewrites the callsites that can be trivially changed to use char*/char16_t*.

I'd somewhat like to remove nsTLiteralString::get() altogether, but in code that's less straightforward than these examples, get() is useful enough to keep.

MozReview-Commit-ID: Kh1rUziVllo

--HG--
extra : rebase_source : c21a65694d6e1c42fd88f73632f7ac8f38d005ae
2017-03-14 15:26:27 +13:00
Iris Hsiao 5cece96e1c Backed out 12 changesets (bug 1344629) for stylo build bustage
Backed out changeset cf4273d3ac30 (bug 1344629)
Backed out changeset a96390e044e0 (bug 1344629)
Backed out changeset d9b330f9bc24 (bug 1344629)
Backed out changeset 2b460fe020af (bug 1344629)
Backed out changeset 0ada91b0452e (bug 1344629)
Backed out changeset 083304fcd6bd (bug 1344629)
Backed out changeset 53d7d1ce2c97 (bug 1344629)
Backed out changeset 55eee7078ae4 (bug 1344629)
Backed out changeset 7d3c06b3eca9 (bug 1344629)
Backed out changeset e5df14c3db61 (bug 1344629)
Backed out changeset 636095ff2815 (bug 1344629)
Backed out changeset 0be052ad24c1 (bug 1344629)
2017-03-14 11:52:24 +08:00
David Major 40f4821701 Bug 1344629 - Part 6: Rewrite unnecessary uses of nsLiteralString. r=dbaron
There's an antipattern where nsLiteralString is used as an unnecessary intermediary in converting from CharT* to CharT*,
e.g. CallAFunctionThatTakesACharPointer(NS_LITERAL_CSTRING("foo").get());
or
NS_NAMED_LITERAL_STRING(foo, "abc");
CallAFunctionThatTakesACharPointer(foo.get());

This patch rewrites the callsites that can be trivially changed to use char*/char16_t*.

I'd somewhat like to remove nsTLiteralString::get() altogether, but in code that's less straightforward than these examples, get() is useful enough to keep.

MozReview-Commit-ID: Kh1rUziVllo

--HG--
extra : rebase_source : c21a65694d6e1c42fd88f73632f7ac8f38d005ae
2017-03-14 15:26:27 +13:00
David Keeler f69c130b16 bug 1239344 - remove error alert for successful PKCS12 operations r=Cykesiopka
MozReview-Commit-ID: Hr6s2v2GmZQ

--HG--
extra : rebase_source : 232c80db1816ab7045cc5dec42c1aeeae3fc6042
2017-03-03 11:12:54 -08:00
ffxbld a5c2b27889 No bug, Automated HPKP preload list update from host bld-linux64-spot-389 - a=hpkp-update 2017-03-13 07:39:08 -07:00
ffxbld 556a1935e6 No bug, Automated HSTS preload list update from host bld-linux64-spot-389 - a=hsts-update 2017-03-13 07:39:06 -07:00
Carsten "Tomcat" Book c1edc7067d merge mozilla-inbound to mozilla-central a=merge 2017-03-13 15:22:26 +01:00