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

7495 Коммитов

Автор SHA1 Сообщение Дата
Ms2ger 8fedd090cc Merge m-i to b-s. 2013-02-28 14:46:10 +01:00
Ms2ger 830992e002 Merge m-c to m-i on a CLOSED TREE. 2013-02-28 14:42:12 +01:00
Ms2ger c8cb9f33eb Merge mozilla-central to build-system. 2013-02-28 12:11:53 +01:00
Gregory Szorc e1b210ddf6 Merge mozilla-central into build-system
The 3 merged files had no conflicts and were manually verified to ensure
no incompatible changes crept in.
2013-02-27 21:02:02 -08:00
Guillaume Destuynder 08cf22e18f Bug 822944: Add production marketplace cert, r=bsmith, modifed by bsmith before checkin
--HG--
rename : security/build/b2g-app-root-cert.der => security/build/test-b2g-app-root-cert.der
rename : security/manager/ssl/tests/unit/test_signed_apps/privileged-app-test-1.0.zip => security/manager/ssl/tests/unit/test_signed_apps/test-privileged-app-test-1.0.zip
extra : source : d23c1cb4e6ab66195de2bea8e818e8f88f120fc5
2013-02-27 17:43:35 -08:00
Gregory Szorc 0c8ee65118 Merge mozilla-central into build-system
There were merges in configure.in and some Makefile.in. None had any
conflicts. I spot verified the Makefile.in changes and confirmed that
the changes did not touch any DIRS* variables.
2013-02-27 10:03:52 -08:00
Ms2ger aea301eee3 Merge m-c to b-s. 2013-02-26 19:09:25 +01:00
Gregory Szorc f859da8cb2 Bug 784841 - Part 18δ: Convert /security; f=Ms2ger rs=ted 2013-02-25 12:47:24 -08:00
Mike Hommey 9d54dc8501 Bug 832272 - Allow mostly parallel build of NSS. r=ted 2013-02-25 10:49:34 +01:00
David Dahl bf359eeabb Bug 673432 - Implement window.crypto.getRandomValues for FirefoxOS r=khuey 2013-02-27 14:31:19 -06:00
L. David Baron d062798712 Bug 404077: Adjust annotations of expected assertions. 2013-02-27 10:37:19 -08:00
L. David Baron e6922de5b3 Bug 404077: Adjust annotations of expected assertions. 2013-02-27 14:55:16 -08:00
L. David Baron 49b7670edf Bug 404077: Use navigator.platform.startsWith rather than navigator.platform.indexOf, at Jesse's suggestion. 2013-02-26 22:23:08 -08:00
Chris Peterson 837f3c03a0 Bug 842931 - Remove unused private member variable nsPKCS12Blob::mTmpFilePath. r=bsmith 2013-02-20 00:47:12 -08:00
L. David Baron a8ee400190 Bug 404077: Annotate known assertions in mochitests. 2013-02-25 18:39:21 -08:00
Chuck Lee 5cfe2d786d Bug 835719 - 0003. Rename JSAutoByteString.encode() to encodeLatin1(). r=terrence 2013-02-21 17:48:17 +08:00
Monica Chew 5fe1efe2a6 Bug 829832 - NEEDS CLOBBER - Compute SHA256 hash on saving files in BackgroundFileSaver. (r=paolo,cviecco,sr=biesi) 2013-02-19 12:47:59 -08:00
Karl Tomlinson 6cf98de946 back out f24c22852083 for xpcshell failures b=829832
--HG--
extra : rebase_source : 151e69e6a280c9c67e9b49d55c11aad1fc0def94
2013-02-20 11:15:51 +13:00
Monica Chew e016eceda0 Bug 829832 - Compute SHA256 hash on saving files in BackgroundFileSaver. (r=paolo,cviecco,sr=biesi) 2013-02-19 12:47:59 -08:00
David Dahl 4b987799be Bug 440046 - expose secure PRNG in the DOM (window.crypto.getRandomValues) r=cviecco r=bsmith 2013-02-15 15:38:15 -08:00
David Dahl cd4de3d8d1 Bug 683262 - window.crypto throws if MOZ_DISABLE_DOMCRYPTO is turned on - revert nsIWindowCrypto patch - r=jst 2013-02-16 22:43:19 -06:00
David Dahl e04136004d Bug 683262 - window.crypto throws if MOZ_DISABLE_DOMCRYPTO is turned on - window.crypto patch - r=jst
--HG--
rename : dom/interfaces/base/nsIDOMCrypto.idl => dom/interfaces/base/nsIDOMCryptoLegacy.idl
2013-02-16 22:43:16 -06:00
Brian Smith a146f1a783 Bug 842064: Fix build bustage caused by expired certificates in test_signed_apps.js on a CLOSED TREE, a=bustage, a=testonly
--HG--
extra : source : ff193fc3dc7d37db4081dd95f1f1aa8e3551d527
extra : histedit_source : 5b6de6aae72860b31173a4a7540f123ecae8892e
2013-02-16 11:21:13 -08:00
Phil Ringnalda c71c586441 Back out 236ba87c0a9f (bug 440046) and d3b7606d94a6:895a7efc978d (bug 683262) for b2g mochitest failures 2013-02-15 23:33:45 -08:00
David Dahl 6743609509 Bug 440046 - expose secure PRNG in the DOM (window.crypto.getRandomValues) r=cviecco r=bsmith 2013-02-15 15:38:15 -08:00
David Dahl 52c440b803 Bug 683262 - window.crypto throws if MOZ_DISABLE_DOMCRYPTO is turned on - revert nsIWindowCrypto patch r=jst 2013-02-15 23:34:18 -06:00
David Dahl a29fc61d9f Bug 683262 - window.crypto throws if MOZ_DISABLE_DOMCRYPTO is turned on - window.crypto patch r=jst
--HG--
rename : dom/interfaces/base/nsIDOMCrypto.idl => dom/interfaces/base/nsIDOMCryptoLegacy.idl
2013-02-15 23:34:15 -06:00
Olli Pettay cd8c72e7b9 Bug 839465 - Implement SmartCardEvent using event code generator, r=mounir 2013-02-11 21:37:20 +02:00
Kai Engert d6ef26dbcc Bug 834091, re-apply an unreleased patch that Mozilla has chosen to use on top of NSS 2013-02-10 01:13:24 +01:00
Kai Engert 0ec2973ab8 Bug 839141 - Upgrade Mozilla to NSS 3.14.3, starting with Beta1, r=ekr 2013-02-10 01:11:00 +01:00
Josh Matthews e8b4da5593 Bug 827272 - Avoid performing cleanup on SSL state that doesn't exist. r=bsmith 2013-01-14 16:53:30 +01:00
Tanvi Vyas 69b6bd8877 Bug 836951 - If piwin is null, return NS_OK and skip setting the mixed content state. r=bsmith 2013-02-06 18:29:24 -08:00
Tanvi Vyas 7866f17cb6 Bug 836459 - If a page has both mixed display and mixed active content loaded, make sure both nsIWebProgressListener flags are set in psm. r=bsmith 2013-01-31 19:27:09 -08:00
Kai Engert 40074efb9e Bug 834741, landing final NSPR 4.9.5 and final NSS 3.14.2, r=wtc.
Keeping the locally applied patch, but bumping its version tag, to indicate it hasn't been part of an official NSS release yet.
2013-02-01 00:31:20 +01:00
Tanvi Vyas 8195c3a033 Bug 822367 - With nsMixedContentBlocker.cpp, mixed content XHR calls are considered mixed active content and yield to a security state of STATE_IS_BROKEN. This fixes this mixed content todo-test to test that passes. r=bsmith 2013-01-30 00:04:49 -08:00
Tanvi Vyas 8d90a422d1 Bug 822367 - Use new nsIWebProgressListenerFlags for mixed active and mixed passive content in PSM. Also update the security state to STATE_IS_BROKEN if nsMixedContentBlocker has detected mixed content (even if PSM has not detected the mixed content). r=bsmith 2013-01-30 00:04:43 -08:00
David Keeler bf362e197b bug 822771 - add timeout to getHSTSPreloadList.js' XHRs r=bsmith DONTBUILD (NPOB) 2013-01-29 11:56:57 -08:00
Ehsan Akhgari 565d0479c3 Bug 817477 - Remove support for global private browsing mode; r=jdm,glandium
--HG--
rename : browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js.in => browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/setup.js
rename : browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js.in => browser/app/profile/extensions/testpilot@labs.mozilla.com/modules/tasks.js
2013-01-29 13:12:13 -05:00
Brian Smith 2223820150 Bug 834741: Update NSS to NSS 3.14.2 BETA 3 (NSS_3_14_2_BETA3), r=me, a=bustage
--HG--
extra : rebase_source : 877c00c76e2c4f0899126afeb5d52c34b47f0f55
2013-01-28 01:37:45 +01:00
Carmen Jiménez Cabezas e209aa39fe Bug 834091: Verify certificate chain for signed B2G apps as of the current time (now) instead of the signing time, r=bsmith
--HG--
extra : amend_source : 86d8ca2b28259aaf41983740b809ef8a51befc4f
extra : rebase_source : e5a1c1199756e929f14852f5c83ba28d097449f4
2013-01-25 15:36:36 -08:00
Ryan VanderMeulen 0c0f4a7dea Backed out changeset eb2f0c1fffc2 (bug 820613) for xpcshell failures.
--HG--
extra : rebase_source : 7fff4cec5a4d7839cd3ede5cd0322631e11f9d38
2013-01-26 14:05:31 -05:00
Shriram Kunchanapalli 07a2e5d95d Bug 820613 - Remove all references to shutdown-cleanse. r=bsmedberg 2013-01-17 00:40:56 +05:30
Kai Engert cb0c1cd199 Bug 834741, NSPR_4_9_5_BETA2 and NSS_3_14_2_BETA2, r=wtc 2013-01-25 17:26:46 +01:00
Ehsan Akhgari 497f06f2c6 Backed out changeset 70baa7e07838 (bug 833915) since one day has passed 2013-01-24 11:12:24 -05:00
Ehsan Akhgari ea3a2d23b4 Bug 833915 - Turn off PGO and LTCG on Windows Nightly for one day; r=glandium 2013-01-23 16:13:50 -05:00
Patrick McManus 1956603633 bug 804605 - backout 766973 767158 785050 r=backout a=akeybl 2013-01-22 11:59:01 -05:00
Brian Smith 901031216b Bug 624514: Make PSM access the network.ntlm.send-lm-response pref only on the main thread, r=honzab
--HG--
extra : rebase_source : ef4c9e19548fbbc9198d1cd63c32a33e797c5dd9
2013-01-18 16:06:12 -08:00
Brian Smith 3378556222 Bug 714477: Do not check the OCSP enabled pref during extended validation, r=rrelyea
--HG--
extra : source : 48823673fe63bd00cd182fe185b6aba0d19eff9d
2013-01-18 10:28:58 -08:00
Mats Palmgren b7ae90666d Bug 786533 - Replace NS_MIN/NS_MAX with std::min/std::max and #include <algorithm> where needed. r=ehsan 2013-01-15 13:22:03 +01:00
Antonio Manuel Amaya Calvo 2c0c73b5c0 Bug 828730: Fix crash in test_signed_apps/generate.sh, r=bsmith, a=NPOTB
--HG--
extra : rebase_source : 7edc7a07b2447c902074735039a17e5f2726096f
2013-01-10 13:55:54 +01:00