[vlc-commits] Win32: sign also the installer with sha2

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Mar 15 00:27:37 2017 +0100| [aeea04d843600e62dfef9072b447a6ee849d49b5] | committer: Jean-Baptiste Kempf

Win32: sign also the installer with sha2

And also fix the rules

(cherry picked from commit 2818f5a281198e20b3f21038452af389ef6a606e)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=aeea04d843600e62dfef9072b447a6ee849d49b5
---

 extras/package/win32/package.mak | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index bc62a09..157f393 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -94,6 +94,7 @@ package-win-strip: package-win-common package-win-npapi
 	  cd $(win32_destdir); find . -type f \( -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' \) | while read i; \
 	  do if test -n "$$i" ; then \
 	    osslsigncode sign -certs $(SIGNATURE)/cert.cer -key $(SIGNATURE)/videolan.key -n "VLC media player" -i http://www.videolan.org/ -t http://timestamp.verisign.com/scripts/timstamp.dll -h sha1 -in "$$i" -out "$$i.sign"; \
+	    mv "$$i.sign" "$$i" ; \
 	    osslsigncode sign -certs $(SIGNATURE)/cert.cer -key $(SIGNATURE)/videolan.key -n "VLC media player" -i http://www.videolan.org/ -t http://timestamp.verisign.com/scripts/timstamp.dll -nest -h sha2 -in "$$i" -out "$$i.sign"; \
 	    mv "$$i.sign" "$$i" ; \
 	  fi ; \
@@ -165,7 +166,9 @@ package-win32-exe: package-win-strip $(win32_destdir)/NSIS/UAC.dll $(win32_destd
 	eval "$$MAKENSIS $(win32_destdir)/spad.nsi"; \
 	eval "$$MAKENSIS $(win32_destdir)/vlc.win32.nsi"
 	if test -n "$(SIGNATURE)"; then \
-		osslsigncode sign -certs $(SIGNATURE)/cert.cer -key $(SIGNATURE)/videolan.key -n "VLC media player" -i http://www.videolan.org/ -t http://timestamp.verisign.com/scripts/timstamp.dll -in "$(WINVERSION).exe" -out "$(WINVERSION).exe.sign"; \
+		osslsigncode sign -certs $(SIGNATURE)/cert.cer -key $(SIGNATURE)/videolan.key -n "VLC media player" -i http://www.videolan.org/ -t http://timestamp.verisign.com/scripts/timstamp.dll -h sha1 -in "$(WINVERSION).exe" -out "$(WINVERSION).exe.sign"; \
+	    mv "$(WINVERSION).exe.sign" "$(WINVERSION).exe" ; \
+		osslsigncode sign -certs $(SIGNATURE)/cert.cer -key $(SIGNATURE)/videolan.key -n "VLC media player" -i http://www.videolan.org/ -t http://timestamp.verisign.com/scripts/timstamp.dll -nest -h sha2 -in "$(WINVERSION).exe" -out "$(WINVERSION).exe.sign"; \
 	    mv "$(WINVERSION).exe.sign" "$(WINVERSION).exe" ; \
 	fi