Commit Graph

11429 Commits

Author SHA1 Message Date
Phil Ringnalda
81c566a8a2 Merge autoland to m-c, a=merge 2017-03-25 18:38:42 -07:00
Phil Ringnalda
2e782ce511 Bug 1350599 - disable hsts tests which depend on bugzilla.mozilla.org always being in the preload list, a=bustage
--HG--
extra : source : 997b98cce1aebf76641e14c79ac250cdb147041c
2017-03-25 14:04:24 -07:00
Carsten "Tomcat" Book
5f408d092d Merge mozilla-central to mozilla-inbound 2017-03-24 14:29:00 +01:00
Carsten "Tomcat" Book
0a1fc914ce Backed out changeset d9872fdd25f8 (bug 1337331) for causing build problems for others + on request on bob 2017-03-24 11:24:13 +01:00
Carsten "Tomcat" Book
50ef4d1d1b Backed out changeset 226c893c5d62 (bug 1337331) 2017-03-24 11:23:42 +01:00
Carsten "Tomcat" Book
3a931395eb Backed out changeset 438b6307c802 (bug 1337331) 2017-03-24 11:23:40 +01:00
Carsten "Tomcat" Book
8dd606e5ce Backed out changeset c4aa6b85411d (bug 1337331) 2017-03-24 11:23:37 +01:00
Carsten "Tomcat" Book
a69a0cc262 Backed out changeset 5cd2e692ee0c (bug 1337331) 2017-03-24 11:23:35 +01:00
Carsten "Tomcat" Book
ed6b3bc409 Backed out changeset 0dd9bae0b6b1 (bug 1337331) 2017-03-24 11:23:33 +01:00
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
Franziskus Kiefer
c055a4757e Bug 1345368 - land NSS 06158d335df0, r=me
--HG--
extra : rebase_source : 75bb3b75d3bbbd4ba3a4e199fa0ad8c999ab38af
2017-03-24 08:38:05 +01:00
Wes Kocher
04968c7c99 Merge m-c to autoland, a=merge
MozReview-Commit-ID: DwtKxCKV42X
2017-03-24 17:20:07 -07:00
David Keeler
d4f3dd148e bug 1345612 - avoid calling NS_NewURI on IP addresses when checking certificate overrides r=Cykesiopka
When determining if a certificate error override is allowed for a host, we
consult nsISiteSecurityService::IsSecureURI to see if the host is HSTS/HPKP.
This API takes an nsIURI, but the calling code only has a hostname as an
nsCString. Calling NS_NewURI works in all situations we will encounter except
when the hostname is an IPv6 address. Since IP addresses are never HSTS/HPKP
anyway, we can skip the NS_NewURI / IsSecureURI calls in those cases as a
workaround.

MozReview-Commit-ID: JXa8cGvqqTA

--HG--
extra : rebase_source : b8dcd2cb4211af230f867ce3954d5333b7a49684
2017-03-20 13:42:27 -07: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