From b1323cabae32a2b0a9a96d7f228c1257c6188058 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Mon, 16 Aug 2021 00:24:49 +0200 Subject: Increment version to 1.24-Update9-Beta-21-08-15 --- src/Common/Tcdefs.h | 4 ++-- src/Setup/MacOSX/veracrypt.pkgproj | 9 ++++++++- src/Setup/MacOSX/veracrypt_Legacy.pkgproj | 2 +- src/Signing/sign-sha256.bat | 2 +- src/Signing/sign.bat | 2 +- src/Signing/sign_test.bat | 2 +- src/Signing/sign_test_debug.bat | 8 ++------ 7 files changed, 16 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index fc9ce28e..d054653f 100644 --- a/src/Common/Tcdefs.h +++ b/src/Common/Tcdefs.h @@ -55,7 +55,7 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift); #define TC_APP_NAME "VeraCrypt" // Version displayed to user -#define VERSION_STRING "1.24-Update9-Beta-21-08-07" +#define VERSION_STRING "1.24-Update9-Beta-21-08-15" #ifdef VC_EFI_CUSTOM_MODE #define VERSION_STRING_SUFFIX "-CustomEFI" @@ -67,7 +67,7 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift); #define VERSION_NUM 0x0124 // Release date -#define TC_STR_RELEASE_DATE L"August 7, 2021" +#define TC_STR_RELEASE_DATE L"August 15, 2021" #define TC_RELEASE_DATE_YEAR 2021 #define TC_RELEASE_DATE_MONTH 8 diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj index 39865a5b..22a2450e 100755 --- a/src/Setup/MacOSX/veracrypt.pkgproj +++ b/src/Setup/MacOSX/veracrypt.pkgproj @@ -838,6 +838,13 @@ https://osxfuse.github.io/ PROJECT_SETTINGS + ADVANCED_OPTIONS + + installer-script.options:hostArchitectures + + x86_64,arm64 + + BUILD_FORMAT 0 BUILD_PATH @@ -1016,7 +1023,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt 1.24-Update9 + VeraCrypt 1.24-Update9-Beta-21-08-15 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj index 3db3c5d6..2bfbdbd8 100755 --- a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj +++ b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj @@ -1060,7 +1060,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt Legacy 1.24-Update9 + VeraCrypt Legacy 1.24-Update9-Beta-21-08-15 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/src/Signing/sign-sha256.bat b/src/Signing/sign-sha256.bat index 7902e66c..d6251967 100644 --- a/src/Signing/sign-sha256.bat +++ b/src/Signing/sign-sha256.bat @@ -1,6 +1,6 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.24-Update9 +set VC_VERSION=1.24-Update9-Beta-21-08-15 set VC_VERSION_NBRE=1.24.25 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat index 34e558d9..d270056c 100644 --- a/src/Signing/sign.bat +++ b/src/Signing/sign.bat @@ -1,6 +1,6 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.24-Update9 +set VC_VERSION=1.24-Update9-Beta-21-08-15 set VC_VERSION_NBRE=1.24.25 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat index 9e4b2e87..fd1a3082 100644 --- a/src/Signing/sign_test.bat +++ b/src/Signing/sign_test.bat @@ -1,5 +1,5 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.24-Update9 +set VC_VERSION=1.24-Update9-Beta-21-08-15 set VC_VERSION_NBRE=1.24.25 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix diff --git a/src/Signing/sign_test_debug.bat b/src/Signing/sign_test_debug.bat index 4b5e33ac..235cafc2 100644 --- a/src/Signing/sign_test_debug.bat +++ b/src/Signing/sign_test_debug.bat @@ -1,5 +1,5 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.24-Update9 +set VC_VERSION=1.24-Update9-Beta-21-08-15 set VC_VERSION_NBRE=1.24.25 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix @@ -15,13 +15,9 @@ 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 "..\Debug\Setup Files\veracrypt.sys" "..\Debug\Setup Files\veracrypt-x64.sys" "..\Debug\Setup Files\VeraCrypt.exe" "..\Debug\Setup Files\VeraCrypt Format.exe" "..\Debug\Setup Files\VeraCryptExpander.exe" "..\Debug\Setup Files\VeraCrypt-x64.exe" "..\Debug\Setup Files\VeraCrypt Format-x64.exe" "..\Debug\Setup Files\VeraCryptExpander-x64.exe" "..\Debug\Setup Files\VeraCrypt COMReg.exe" - -timeout /t 10 rem sign using SHA-256 -signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /as /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Debug\Setup Files\veracrypt.sys" "..\Debug\Setup Files\veracrypt-x64.sys" "..\Debug\Setup Files\veracrypt-arm64.sys" "..\Debug\Setup Files\VeraCrypt.exe" "..\Debug\Setup Files\VeraCrypt Format.exe" "..\Debug\Setup Files\VeraCryptExpander.exe" "..\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" +signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Debug\Setup Files\veracrypt.sys" "..\Debug\Setup Files\veracrypt-x64.sys" "..\Debug\Setup Files\veracrypt-arm64.sys" "..\Debug\Setup Files\VeraCrypt.exe" "..\Debug\Setup Files\VeraCrypt Format.exe" "..\Debug\Setup Files\VeraCryptExpander.exe" "..\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\" -- cgit v1.2.3