From 43610d09e036b5009b8a567e74b75d49c3b2031c Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 25 Apr 2019 08:17:28 +0200
Subject: build: improve signature and version situation

---
 installer/build.bat | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'installer')

diff --git a/installer/build.bat b/installer/build.bat
index 36760291..3842e411 100644
--- a/installer/build.bat
+++ b/installer/build.bat
@@ -1,8 +1,9 @@
 @echo off
-rem SPDX-License-Identifier: GPL-2.0
-rem (C) 2019 WireGuard LLC. All Rights Reserved.
+rem SPDX-License-Identifier: MIT
+rem Copyright (C) 2019 WireGuard LLC. All Rights Reserved.
 
-set WIREGUARD_VERSION=0.1
+for /f "tokens=3" %%a in ('findstr /r "[0-9.]*" ..\version.h') do set WIREGUARD_VERSION=%%a
+set WIREGUARD_VERSION=%WIREGUARD_VERSION:"=%
 
 set STARTDIR=%cd%
 set OLDWIX=%WIX%
@@ -22,10 +23,10 @@ if exist .deps\prepared goto :build
 	rem curl -#fo wintun-x86.msm https://www.wintun.net/builds/wintun-x86-0.1.msm || goto :error
 	rem echo [+] Verifying wintun-x86
 	rem for /f %%a in ('CertUtil -hashfile wintun-x86.msm SHA256 ^| findstr /r "^[0-9a-f]*$"') do if not "%%a"=="5390762183e181804b28eb13815b6210f85a1280057b815f749b06768215f817" goto :error
-	rem echo [+] Downloading wintun-amd64
-	rem curl -#fo wintun-amd64.msm https://www.wintun.net/builds/wintun-amd64-0.1.msm || goto :error
-	rem echo [+] Verifying wintun-amd64
-	rem for /f %%a in ('CertUtil -hashfile wintun-amd64.msm SHA256 ^| findstr /r "^[0-9a-f]*$"') do if not "%%a"=="5390762183e181804b28eb13815b6210f85a1280057b815f749b06768215f817" goto :error
+	echo [+] Downloading wintun-amd64
+	curl -#fo wintun-amd64.msm https://www.wintun.net/builds/wintun-amd64-0.1.msm || goto :error
+	echo [+] Verifying wintun-amd64
+	for /f %%a in ('CertUtil -hashfile wintun-amd64.msm SHA256 ^| findstr /r "^[0-9a-f]*$"') do if not "%%a"=="850b8e76ced2b1bbbfd601b04726b6e491d14b583694d139855c1d337ee48590" goto :error
 	echo [+] Extracting wix-binaries
 	mkdir wix\bin || goto :error
 	tar -xf wix-binaries.zip -C wix\bin || goto :error
@@ -38,10 +39,11 @@ if exist .deps\prepared goto :build
 	set WIX=%STARTDIR%\.deps\wix\
 	call :msi x86   x86 || goto :error
 	call :msi amd64 x64 || goto :error
+	if exist ..\sign.bat call ..\sign.bat
 	if "%SigningCertificate%"=="" goto :build_sfx
-	if "%TimeStampServer%"=="" goto :build_sfx
+	if "%TimestampServer%"=="" goto :build_sfx
 	echo [+] Signing
-	signtool.exe sign /sha1 "%SigningCertificate%" /fd sha256 /tr "%TimeStampServer%" /td sha256 /d "WireGuard Setup" "dist\wireguard-*-%WIREGUARD_VERSION%.msi" || goto :error
+	signtool.exe sign /sha1 "%SigningCertificate%" /fd sha256 /tr "%TimestampServer%" /td sha256 /d "WireGuard Setup" "dist\wireguard-*-%WIREGUARD_VERSION%.msi" || goto :error
 
 :build_sfx
 	rem TODO: Build SFX bundle with all MSIs.
-- 
cgit v1.2.3-59-g8ed1b