diff options
-rw-r--r-- | src/Release/Setup Files/Product64.wxs | 4 | ||||
-rw-r--r-- | src/Signing/sign.bat | 4 | ||||
-rw-r--r-- | src/Signing/sign_TESTSIGNING.bat | 4 | ||||
-rw-r--r-- | src/Signing/sign_test.bat | 4 | ||||
-rw-r--r-- | src/Signing/sign_test_debug.bat | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/Release/Setup Files/Product64.wxs b/src/Release/Setup Files/Product64.wxs index fdf4c02b..c1c57889 100644 --- a/src/Release/Setup Files/Product64.wxs +++ b/src/Release/Setup Files/Product64.wxs @@ -1,35 +1,35 @@ <?xml version="1.0" encoding="utf-8"?> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"> <!-- FullProductVersion's first 3 parts MUST BE incremented at each release in order for upgrades to work ; Windows Installer ignores the 4th part --> - <?define var.FullProductVersion = 1.26.19?> + <?define var.FullProductVersion = 1.26.20?> <?define var.ProductName = VeraCrypt $(var.FullProductVersion)?> <!-- Unique GUID identifying this family of product (32-bit and 64-bit have the same) --> <?define var.UpgradeCode = {298F5D2B-3B01-4A13-BEFD-4B3C7BE43BC6}?> <!-- Unique GUID identifying this product release (32-bit and 64-bit have different ones) --> <!-- MUST BE regenerated for each new release --> - <?define var.ProductGuid = {831398ED-FE8B-4F4B-B44A-DE392C5D192E}?> + <?define var.ProductGuid = {206DCF7E-CA28-421D-B5DE-0AD30E1132CD}?> <!-- Unique GUID identifying a particular Windows Installer package --> <!-- When compiling a product, it should not be set in order to allow it to be generated for each build --> <?define var.PackageCode = "*"?> <!-- Set path to License file --> <?define var.licenseRtf = "$(sys.CURRENTDIR)\License.rtf"?> <!-- See https://wixtoolset.org/documentation/manual/v3/xsd/wix/product.html --> <!-- Lang will be defined in a .wxl file which will be passed to the WIX linker 'light' --> <Product Id="$(var.ProductGuid)" Language="!(loc.Lang)" Manufacturer="IDRIX" Name="$(var.ProductName)" Version="$(var.FullProductVersion)" UpgradeCode="$(var.UpgradeCode)"> <!-- See https://wixtoolset.org/documentation/manual/v3/xsd/wix/package.html --> <!-- InstallerVersion="500"(v5.0) Released with Windows 7 and later, see https://en.wikipedia.org/wiki/Windows_Installer --> <!-- Language IDs (LCIDs) can be found here https://docs.microsoft.com/en-us/previous-versions/windows/embedded/ms912047(v=winembedded.10)?redirectedfrom=MSDN --> diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat index b4af2b17..1ddb1a70 100644 --- a/src/Signing/sign.bat +++ b/src/Signing/sign.bat @@ -1,24 +1,24 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86 -set VC_VERSION=1.26.19 -set VC_VERSION_NBRE=1.26.19 +set VC_VERSION=1.26.20 +set VC_VERSION_NBRE=1.26.20 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% rem call "..\..\doc\chm\create_chm.bat" cd %SIGNINGPATH% rem sign using SHA-256 signtool sign /v /sha1 88c1ff4b7469ea3915bd8e7635a7567d34f43202 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\VeraCrypt-x64.exe" "..\Release\Setup Files\VeraCrypt Format-x64.exe" "..\Release\Setup Files\VeraCryptExpander-x64.exe" "..\Release\Setup Files\VeraCrypt-arm64.exe" "..\Release\Setup Files\VeraCrypt Format-arm64.exe" "..\Release\Setup Files\VeraCryptExpander-arm64.exe" "..\Release\Setup Files\VeraCryptSetup.dll" rem create setup and MSI cd "..\Release\Setup Files\" copy ..\..\LICENSE . copy ..\..\License.txt . copy ..\..\NOTICE . copy ..\..\Resources\Texts\License.rtf . copy ..\..\Common\VeraCrypt.ico . copy ..\..\Setup\VeraCrypt_setup_background.bmp . copy ..\..\Setup\VeraCrypt_setup.bmp . copy ..\..\Setup\Setup.ico . diff --git a/src/Signing/sign_TESTSIGNING.bat b/src/Signing/sign_TESTSIGNING.bat index 91d6e613..ce56de3c 100644 --- a/src/Signing/sign_TESTSIGNING.bat +++ b/src/Signing/sign_TESTSIGNING.bat @@ -1,24 +1,24 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.26.19 -set VC_VERSION_NBRE=1.26.19 +set VC_VERSION=1.26.20 +set VC_VERSION_NBRE=1.26.20 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% rem sign using SHA-256 signtool sign /v /sha1 88c1ff4b7469ea3915bd8e7635a7567d34f43202 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\veracrypt-x64.sys" "..\Release\Setup Files\veracrypt-arm64.sys" signtool sign /v /sha1 88c1ff4b7469ea3915bd8e7635a7567d34f43202 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\VeraCrypt-x64.exe" "..\Release\Setup Files\VeraCrypt Format-x64.exe" "..\Release\Setup Files\VeraCryptExpander-x64.exe" "..\Release\Setup Files\VeraCrypt-arm64.exe" "..\Release\Setup Files\VeraCrypt Format-arm64.exe" "..\Release\Setup Files\VeraCryptExpander-arm64.exe" "..\Release\Setup Files\VeraCrypt COMReg.exe" "..\Release\Setup Files\VeraCryptSetup.dll" rem create setup and MSI cd "..\Release\Setup Files\" copy ..\..\LICENSE . copy ..\..\License.txt . copy ..\..\NOTICE . copy ..\..\Resources\Texts\License.rtf . copy ..\..\Common\VeraCrypt.ico . copy ..\..\Setup\VeraCrypt_setup_background.bmp . copy ..\..\Setup\VeraCrypt_setup.bmp . copy ..\..\Setup\Setup.ico . del *.xml rmdir /S /Q Languages diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat index aced968e..4af038a4 100644 --- a/src/Signing/sign_test.bat +++ b/src/Signing/sign_test.bat @@ -1,23 +1,23 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.26.19 -set VC_VERSION_NBRE=1.26.19 +set VC_VERSION=1.26.20 +set VC_VERSION_NBRE=1.26.20 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt set SHA256PFXNAME=TestCertificate\idrix_Sha256CodeSign.pfx set SHA256PFXPASSWORD=idrix set SHA256PFXCA=TestCertificate\idrix_SHA256TestRootCA.crt set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% call "..\..\doc\chm\create_chm.bat" cd %SIGNINGPATH% rem sign using SHA-1 signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac %PFXCA% /fd sha1 /t http://timestamp.digicert.com "..\Release\Setup Files\veracrypt-x64.sys" "..\Release\Setup Files\veracrypt-arm64.sys" "..\Release\Setup Files\VeraCrypt-x64.exe" "..\Release\Setup Files\VeraCrypt Format-x64.exe" "..\Release\Setup Files\VeraCryptExpander-x64.exe" "..\Release\Setup Files\VeraCrypt COMReg.exe" timeout /t 10 rem sign using SHA-256 diff --git a/src/Signing/sign_test_debug.bat b/src/Signing/sign_test_debug.bat index 4be10344..bdf3cc31 100644 --- a/src/Signing/sign_test_debug.bat +++ b/src/Signing/sign_test_debug.bat @@ -1,23 +1,23 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.26.19 -set VC_VERSION_NBRE=1.26.19 +set VC_VERSION=1.26.20 +set VC_VERSION_NBRE=1.26.20 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt set SHA256PFXNAME=TestCertificate\idrix_Sha256CodeSign.pfx set SHA256PFXPASSWORD=idrix set SHA256PFXCA=TestCertificate\idrix_SHA256TestRootCA.crt set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% call "..\..\doc\chm\create_chm.bat" cd %SIGNINGPATH% rem sign using SHA-256 signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Debug\Setup Files\veracrypt-x64.sys" "..\Debug\Setup Files\veracrypt-arm64.sys" "..\Debug\Setup Files\VeraCrypt-x64.exe" "..\Debug\Setup Files\VeraCrypt Format-x64.exe" "..\Debug\Setup Files\VeraCryptExpander-x64.exe" "..\Debug\Setup Files\VeraCrypt-arm64.exe" "..\Debug\Setup Files\VeraCrypt Format-arm64.exe" "..\Debug\Setup Files\VeraCryptExpander-arm64.exe" "..\Debug\Setup Files\VeraCrypt COMReg.exe" rem create setup and MSI cd "..\Debug\Setup Files\" |