From 6b4d88a31665ac234a27aa5fe492b9c79938bd1c Mon Sep 17 00:00:00 2001 From: Kathy Brade Date: Fri, 20 May 2016 11:08:51 -0400 Subject: [PATCH] Bug 19121: reinstate the update.xml hash check This is a partial revert of commit f1241db6986e4b54473a1ed870f7584c75d51122. Revert the nsUpdateService.js changes from Mozilla Bug 862173 "don't verify mar file hash when using mar signing to verify the mar file (lessens main thread I/O)." Changes to the tests were not reverted; the tests have been changed significantly and we do not run automated updater tests for Tor Browser at this time. We kept the addition to the AppConstants API in case other JS code references it in the future. --- toolkit/mozapps/update/UpdateService.jsm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/toolkit/mozapps/update/UpdateService.jsm b/toolkit/mozapps/update/UpdateService.jsm index 8b0597ce57979..442ef958739b2 100644 --- a/toolkit/mozapps/update/UpdateService.jsm +++ b/toolkit/mozapps/update/UpdateService.jsm @@ -4403,13 +4403,6 @@ Downloader.prototype = { } LOG("Downloader:_verifyDownload downloaded size == expected size."); - - // The hash check is not necessary when mar signatures are used to verify - // the downloaded mar file. - if (AppConstants.MOZ_VERIFY_MAR_SIGNATURE) { - return true; - } - let fileStream = Cc["@mozilla.org/network/file-input-stream;1"]. createInstance(Ci.nsIFileInputStream); fileStream.init(destination, FileUtils.MODE_RDONLY, FileUtils.PERMS_FILE, 0); -- GitLab