Carsten "Tomcat" Book
e2399947f4
Merge mozilla-central to mozilla-inbound
2015-02-16 16:14:51 +01:00
Carsten "Tomcat" Book
08fafcb3e2
merge mozilla-inbound to mozilla-central a=merge
2015-02-16 15:59:56 +01:00
ffxbld
99b5f33384
No bug, Automated HPKP preload list update from host bld-linux64-spot-1093 - a=hpkp-update
2015-02-14 03:21:57 -08:00
ffxbld
c9826729b7
No bug, Automated HSTS preload list update from host bld-linux64-spot-1093 - a=hsts-update
2015-02-14 03:21:55 -08:00
Masatoshi Kimura
eb132d66f6
Bug 1131880 - Modify the condition to disallow PR_CONNECT_RESET_ERROR on fallback. r=keeler
2015-02-16 20:03:06 +09:00
Masatoshi Kimura
7e78ba3eec
Backout 9507662057de (bug 1130670) and c731517a47e8 (bug 1124039) due to compatibility issues
2015-02-16 19:55:15 +09:00
Mike Hommey
6786219e1f
Bug 1120937 - Properly initialize string fields from the PKCS#11 test module. r=keeler
...
The string fields need to be padded with spaces, according to what
PK11_MakeString does to find the end of the string.
While here, factor all the string manipulations in the test module and
use some C++ template magic to do the right thing.
This changes the static asserts from (with clang):
pkcs11testmodule.cpp:45:3: error: static_assert failed
"TestManufacturerID too long - make it shorter"
static_assert(sizeof(TestManufacturerID) <= sizeof(pInfo->manufacturerID),
^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
to:
pkcs11testmodule.cpp:46:3: error: static_assert failed
"DestSize >= SrcSize - 1"
static_assert(DestSize >= SrcSize - 1, "DestSize >= SrcSize - 1");
^ ~~~~~~~~~~~~~~~~~~~~~~~
pkcs11testmodule.cpp:58:3: note: in instantiation of function
template specialization 'CopyString<32, 63>' requested here
CopyString(pInfo->manufacturerID, TestManufacturerID);
^
which actually gives more information than before: it gives the length of
both buffers.
2015-02-13 10:29:18 +09:00
Masatoshi Kimura
1b6561194e
Bug 1130670 - Remove dead code that tracks strongCipherStatus. r=keeler
2015-02-14 15:16:04 +09:00
Nicholas Nethercote
3a7b0a9f57
Bug 1131901 (part 1) - Make PL_DHashTableAdd() infallible by default, and add a fallible alternative. r=froydnj.
...
I kept all the existing PL_DHashTableAdd() calls fallible, in order to be
conservative, except for the ones in nsAtomTable.cpp which already were
followed immediately by an abort on failure.
--HG--
extra : rebase_source : 526d96ab65e4d7d71197b90d086d19fbdd79b7b5
2015-02-02 14:48:58 -08:00
Cykesiopka
d92c1180e0
Bug 1130405 - Remove unused pippki strings. r=jcj
2015-02-11 05:08:00 -05:00
Cykesiopka
edf6d8ff32
Bug 1130402 - Make use of currently unused certManager.dtd access key strings. r=jcj
2015-02-07 01:16:00 -05:00
Bob Owen
78f86d5dec
Bug 1132021 - Add a new sandbox level for Windows NPAPI to use USER_LIMITED access token level. r=bsmedberg, r=bbondy
2015-02-11 16:25:43 +00:00
Cykesiopka
2c768c2db6
Bug 1131475 - Make sure reference to "unable_to_toggle_fips" bundle key is in the correct case. r=jcj
2015-02-11 05:05:00 -05:00
Andrew McCreight
31ba9aaed9
Bug 1131199, part 2 - Make PLDHashtInitEntry infallible. r=froydnj
...
Also, drop the unused table argument.
2015-02-11 09:46:40 -08:00
Andrew McCreight
6ec7fe58dd
Bug 1131199, part 1 - Allocation of CompareCacheHashEntryPtr::entry is infallible. r=froydnj
2015-02-11 09:46:40 -08:00
Brian Smith
7755422e90
Bug 1102195 Part 4: Re-apply - Change a non-conforming usage of a const value type to a non-const value type, which VS2015 rightly rejects, r=bobowen
...
Originally landed as changset:
https://hg.mozilla.org/mozilla-central/rev/c827c112df81
2015-01-07 23:28:51 -08:00
Bob Owen
931cf70b78
Bug 1102195 Part 3: Re-apply logging changes to the Chromium interception code. r=tabraldes
...
Originally landed as changset:
https://hg.mozilla.org/mozilla-central/rev/0f763c186855
2014-11-29 17:12:18 +00:00
Bob Owen
09607f7c35
Bug 1102195 Part 2: Re-apply pre-vista stdout/err process inheritance change to Chromium code after merge. r=tabraldes
...
Originally landed as changset:
https://hg.mozilla.org/mozilla-central/rev/f94a07671389
2014-11-18 15:11:47 +00:00
Bob Owen
a887f0edbd
Bug 1102195 Part 1: Update Chromium sandbox code to commit df7cc6c04725630dd4460f29d858a77507343b24. r=aklotz, r=jld
2015-02-11 08:22:02 +00:00
Brian Smith
a89b90ea7f
Bug 1130754: Avoid recalculating tbsCertificate digest, r=keeler
...
--HG--
extra : rebase_source : 85266413568df928cb1eaf1cd59b52ee9d4259e6
extra : histedit_source : 767e3263d28926435c6d2f4610c7d8b01e9ba87d
2015-02-07 12:14:31 -08:00
Nicholas Nethercote
63e3218e4c
Back out changesets 2fcef6b54be7, 2be07829fefc, 66dfe37b8532, df3fcd2be8fd, 0a436bce77a6 (bug 1050035) for causing intermittent crashes and assertion failures.
...
--HG--
extra : rebase_source : eb30be83c3143c6c203585a80a18f180025efaba
2015-02-10 14:39:49 -08:00
Brian Smith
b0f87b9b6c
Bug 1122841, Part 2: Centralize checking of public key, r=keeler
...
--HG--
extra : rebase_source : 6b41ad2d3f37bead8d3ac8b48c5ee0b8063c795b
extra : source : d470b5a68bf915cfb12f0e948e1492463092883c
2015-02-02 16:17:08 -08:00
Brian Smith
dbc534e182
Bug 1122841, Part 1: Add PositiveInteger parser, r=keeler
...
--HG--
extra : rebase_source : 50d79951398e44bf2718c0f071962aa00660fec2
2015-02-06 18:21:20 -08:00
Brian Smith
1bb835dbca
Bug 1128413, Part 4: Fix warnings in mozilla-config.h and gcc-stl-wrapper.template.h, r=glandium
...
--HG--
extra : rebase_source : 7ba4fb8a0bd11648908e2790e86ce3bb4517aeb7
2015-02-02 17:35:19 -08:00
Brian Smith
3920fcd650
Bug 1128413, Part 3: Enable more compiler warnings, r=mmc
...
--HG--
extra : rebase_source : 2d17605e6b9296b74493526e052b771be18d4260
2015-02-07 14:38:40 -08:00
Brian Smith
6254cc408e
Bug 1128413, Part 2: Don't use double underscores any more
...
--HG--
extra : rebase_source : 5f550089aea320231ca2398126fc7f03e5dffc37
2015-01-31 19:51:46 -08:00
Brian Smith
a4ceeff7d4
Bug 1128413, Part 1: Fix switch-related warnings, r=mmc
...
--HG--
extra : rebase_source : 3d70c2a4ae8f9705a8a2c56c2f49e50fe4711ea9
2015-02-02 14:21:27 -08:00
Masatoshi Kimura
83c11c2359
Bug 1124039 - Enable RC4 only if ClientHelloVersion <= TLS 1.0. r=keeler
2015-02-10 22:29:51 +09:00
Cykesiopka
500d8c1041
Bug 897690 - Remove misleading error message from AppendErrorTextUntrusted. r=dkeeler
...
--HG--
extra : rebase_source : b232fa770189e40916ca60a18c6b12c24d2a77dd
2015-02-09 03:50:00 +01:00
Bob Owen
a6f34cc0d5
Bug 1129369 Part 3: Turn on MITIGATION_STRICT_HANDLE_CHECKS process-level mitigation for the GMP sandbox. r=tabraldes
2015-02-10 09:06:59 +00:00
Bob Owen
70afa43d6f
Bug 1129369 Part 2: Turn on BOTTOM_UP_ASLR process-level mitigation for the GMP sandbox. r=tabraldes
2015-02-10 09:06:59 +00:00
Bob Owen
1a190016de
Bug 1129369 Part 1: Turn on DEP_NO_ATL_THUNK process-level mitigation for the GMP sandbox. r=tabraldes
2015-02-10 09:06:59 +00:00
Nicholas Nethercote
242708cf72
Bug 1127201 (attempt 2, part 1) - Replace most NS_ABORT_IF_FALSE calls with MOZ_ASSERT. r=Waldo.
...
--HG--
extra : rebase_source : 488e401ff87e31a2074c4108c4df0572d9536667
2015-02-09 14:34:50 -08:00
Masatoshi Kimura
c199c43026
Bug 1126413 - Part 2: UI changes to display security info on broken secure pages. r=dolske
2015-02-10 04:16:23 +09:00
Masatoshi Kimura
8573fc1f7e
Bug 1126413 - Part 1: Expose nsISSLStatus for broken secure pages. r=keeler
2015-02-10 04:16:22 +09:00
Phil Ringnalda
c456d08848
Merge m-i to m-c, a=merge
2015-02-07 08:45:54 -08:00
ffxbld
a14db61a3f
No bug, Automated HPKP preload list update from host bld-linux64-spot-075 - a=hpkp-update
2015-02-07 03:24:40 -08:00
ffxbld
ae1fda75a2
No bug, Automated HSTS preload list update from host bld-linux64-spot-075 - a=hsts-update
2015-02-07 03:24:38 -08:00
Bob Owen
1a4af9dc4c
Bug 1127230: Change the NPAPI sandbox prefs to integers to indicate the level of sandboxing. r=bsmedberg
2015-01-30 17:48:15 +00:00
Masatoshi Kimura
562649fe82
Bug 1128227 - Add a static TLS insecure fallback whitelist. r=keeler
2015-02-07 13:03:23 +09:00
Nicholas Nethercote
d34f0301b8
Bug 1127201 (part 2) - Convert all NS_ABORT_IF_FALSE calls to MOZ_ASSERT. r=Waldo.
...
--HG--
extra : rebase_source : 99182e70335d2b5ff95f8c528ae992d37294be3a
2015-02-04 20:05:36 -08:00
Masatoshi Kimura
21dab1da42
Bug 1128763 - Do insecure fallback after PR_CONNECT_RESET_ERROR for whitelisted sites only. r=keeler
2015-02-05 22:02:32 +09:00
Masatoshi Kimura
6fbc2ae89f
Bug 1116891 - Do fallback with RC4 cipher suites after PR_CONNECT_RESET_ERROR. r=bsmith
2015-02-05 22:02:31 +09:00
Masatoshi Kimura
b99b9fe12a
Bug 1127285 - Remove unused fallback reasons. r=keeler
2015-02-05 22:02:31 +09:00
Cykesiopka
03f599fcf0
Bug 1128917 - Replace getp12password.xul with a call to nsIPromptService::PromptPassword(). r=keeler
...
--HG--
extra : rebase_source : a92f80292395cbc9105cf9564f6f5005da2ff582
2015-02-05 03:28:00 +01:00
TheKK
3cda0706de
Bug 1092398 - "remove unused CertVerifier enums (missing_cert_download_config and crl_download_config)". r=honzab.moz
2015-01-23 06:17:00 +01:00
Nicholas Nethercote
b5913e0b3d
Bug 1050035 (part 4) - Make PL_DHashTableAdd() infallible by default, and add a fallible alternative. r=froydnj.
...
I kept all the existing PL_DHashTableAdd() calls fallible, in order to be
conservative, except for the ones in nsAtomTable.cpp which already were
followed immediately by an abort on failure.
--HG--
extra : rebase_source : eeba14d732077ef2e412f4caca852de6b6b85f55
2015-02-02 14:48:58 -08:00
Nicholas Nethercote
9a36fdbde4
Bug 1050035 (part 2) - Remove the fallible version of PL_DHashTableInit(). r=froydnj,mrbkap.
...
Because it's no longer needed now that entry storage isn't allocated there.
(The other possible causes of failures are much less interesting and simply
crashing is a reasonable thing to do for them.)
This also makes PL_DNewHashTable() infallible.
--HG--
extra : rebase_source : 848cc9bbdfe434525857183b8370d309f3acbf49
2015-02-01 20:19:08 -08:00
David Keeler
dcc3953291
bug 832837 - move insecure form submission warning from nsSecureBrowserUIImpl to the HTML form implementation r=mrbkap r=phlsa
...
As a result, we can remove nsSecurityWarningDialogs completely, which this patch also does.
2015-01-15 11:01:10 -08:00
Cykesiopka
caa1e7521a
Bug 78808 - Enable Cert Manager buttons only when they would have an effect. Original patch by Scott Johnson. r=keeler
2015-01-31 14:20:00 +01:00