Bug 1410769: Use SHA-1 signing when MAR_OLD_FORMAT is set; r?rstrong,nalexander
MozReview-Commit-ID: DFjcozLqskI
--- a/tools/update-packaging/Makefile.in
+++ b/tools/update-packaging/Makefile.in
@@ -38,36 +38,42 @@ include $(topsrcdir)/toolkit/mozapps/ins
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
ifdef MOZ_EXTERNAL_SIGNING_FORMAT
# We can't use sha2signcode on mar files
MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out sha2signcode,$(MOZ_EXTERNAL_SIGNING_FORMAT))
MOZ_EXTERNAL_SIGNING_FORMAT := mar $(MOZ_EXTERNAL_SIGNING_FORMAT)
endif
+ifndef MAR_OLD_FORMAT
+MAR_SIGN_FORMAT=mar_sha384
+else
+MAR_SIGN_FORMAT=mar
+endif
+
dir-stage := $(call mkdir_deps,$(STAGE_DIR))
complete-patch:: $(dir-stage)
ifeq ($(OS_TARGET), WINNT)
test -f $(UNPACKAGE)
$(RM) -rf '$(PACKAGE_DIR)'
cd $(PACKAGE_BASE_DIR) && $(INNER_UNMAKE_PACKAGE)
endif
MAR=$(MAR_BIN) \
MOZ_PRODUCT_VERSION=$(MOZ_APP_VERSION) \
$(srcdir)/make_full_update.sh \
'$(DIST)/$(COMPLETE_MAR)' \
'$(PACKAGE_DIR)'
ifdef MOZ_SIGN_CMD
- $(MOZ_SIGN_CMD) -f mar_sha384 '$(DIST)/$(COMPLETE_MAR)'
+ $(MOZ_SIGN_CMD) -f $(MAR_SIGN_FORMAT) '$(DIST)/$(COMPLETE_MAR)'
endif
partial-patch:: $(dir-stage)
MAR=$(MAR_BIN) \
MBSDIFF=$(MBSDIFF_BIN) \
MOZ_PRODUCT_VERSION=$(MOZ_APP_VERSION) \
$(srcdir)/make_incremental_update.sh \
'$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).partial.$(SRC_BUILD_ID)-$(DST_BUILD_ID).mar' \
'$(SRC_BUILD)' \
'$(DST_BUILD)'
ifdef MOZ_SIGN_CMD
- $(MOZ_SIGN_CMD) -f mar_sha384 '$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).partial.$(SRC_BUILD_ID)-$(DST_BUILD_ID).mar'
+ $(MOZ_SIGN_CMD) -f $(MAR_SIGN_FORMAT) '$(STAGE_DIR)/$(PKG_UPDATE_BASENAME).partial.$(SRC_BUILD_ID)-$(DST_BUILD_ID).mar'
endif