mozilla-central: changeset 58122:4deec1586536fe0773aab091b4c259b3d0d753a7

author	Michael Wu <mwu@mozilla.com>
	Tue, 23 Nov 2010 21:14:52 -0500
changeset 58122	4deec1586536fe0773aab091b4c259b3d0d753a7
parent 58121	2aceea4f527bfa32a2db95f7b465ef4961b24a95
child 58123	9c3babe383e147c4ec8e1fb11462fd0425d49c42
push id	17166
push user	blassey@mozilla.com
push date	Wed, 24 Nov 2010 02:17:51 +0000
treeherder	mozilla-central@4deec1586536 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	tglek, blocking-fennec
bugs	613603
milestone	2.0b8pre
first release with	nightly linux32 7f5cd850578e / 4.0b8pre / 20101124031154 / files nightly linux64 7f5cd850578e / 4.0b8pre / 20101124031053 / files nightly mac 7f5cd850578e / 4.0b8pre / 20101124031038 / files nightly win32 7f5cd850578e / 4.0b8pre / 20101124042634 / files nightly win64 7f5cd850578e / 4.0b8pre / 20101124054710 / files
last release without	nightly linux32 4b9ba5049e66 / 4.0b8pre / 20101123030721 / files nightly linux64 4b9ba5049e66 / 4.0b8pre / 20101123030837 / files nightly mac 4b9ba5049e66 / 4.0b8pre / 20101123030810 / files nightly win32 4b9ba5049e66 / 4.0b8pre / 20101123045657 / files nightly win64 4b9ba5049e66 / 4.0b8pre / 20101123044505 / files

--- a/modules/libjar/nsJAR.cpp
+++ b/modules/libjar/nsJAR.cpp
@@ -388,16 +388,23 @@ nsJAR::GetInputStreamWithSpec(const nsAC
 NS_IMETHODIMP
 nsJAR::GetCertificatePrincipal(const char* aFilename, nsIPrincipal** aPrincipal)
 {
   //-- Parameter check
   if (!aPrincipal)
     return NS_ERROR_NULL_POINTER;
   *aPrincipal = nsnull;
 
+#ifdef MOZ_OMNIJAR
+  // Don't check signatures in the omnijar - this is only
+  // interesting for extensions/XPIs.
+  if (mZip == mozilla::OmnijarReader())
+    return NS_OK;
+#endif
+
   //-- Parse the manifest
   nsresult rv = ParseManifest();
   if (NS_FAILED(rv)) return rv;
   if (mGlobalStatus == JAR_NO_MANIFEST)
     return NS_OK;
 
   PRInt16 requestedStatus;
   if (aFilename)