From 441babf069f59088a0b8deaef4f17027dfbcc1ab Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sat, 2 Jan 2021 01:05:17 +0100 Subject: Increment version to 1.24-Update9 --- src/Build/CMakeLists.txt | 4 ++-- src/Build/Resources/MacOSX/Info.plist.legacy.xml | 2 +- src/Build/Resources/MacOSX/Info.plist.xml | 2 +- src/Common/Tcdefs.h | 8 ++++---- src/Driver/Driver.rc | 4 ++-- src/ExpandVolume/ExpandVolume.rc | 8 ++++---- src/Format/Format.rc | 8 ++++---- src/Mount/Mount.rc | 8 ++++---- src/Release/Setup Files/veracrypt-x64.cat | Bin 10649 -> 10649 bytes src/Release/Setup Files/veracrypt-x64.sys | Bin 830600 -> 830608 bytes src/Release/Setup Files/veracrypt.Inf | 4 ++-- src/Release/Setup Files/veracrypt.cat | Bin 10585 -> 10585 bytes src/Release/Setup Files/veracrypt.sys | Bin 797320 -> 797328 bytes src/Setup/MacOSX/veracrypt.pkgproj | 4 ++-- src/Setup/MacOSX/veracrypt_Legacy.pkgproj | 4 ++-- src/Setup/Portable.rc | 8 ++++---- src/Setup/Setup.rc | 8 ++++---- src/Signing/sign-sha256.bat | 5 +++-- src/Signing/sign.bat | 2 +- src/Signing/sign_test.bat | 4 ++-- src/Signing/sign_test_debug.bat | 4 ++-- 21 files changed, 44 insertions(+), 43 deletions(-) (limited to 'src') diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt index 71f78a0f..a9b7967f 100644 --- a/src/Build/CMakeLists.txt +++ b/src/Build/CMakeLists.txt @@ -11,8 +11,8 @@ elseif ( NOT DEFINED NOGUI ) endif() # - Set version of the package -set( FULL_VERSION "1.24-Update8" ) -set( VERSION "1.24.24" ) +set( FULL_VERSION "1.24-Update9" ) +set( VERSION "1.24.25" ) set( RELEASE "1" ) # - Set PROJECT_NAME and CONFLICT_PACKAGE values diff --git a/src/Build/Resources/MacOSX/Info.plist.legacy.xml b/src/Build/Resources/MacOSX/Info.plist.legacy.xml index c57a16ea..41321c05 100644 --- a/src/Build/Resources/MacOSX/Info.plist.legacy.xml +++ b/src/Build/Resources/MacOSX/Info.plist.legacy.xml @@ -74,7 +74,7 @@ TRUE CFBundleVersion - 1.24.24 + 1.24.25 CFBundleShortVersionString _VERSION_ diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml index 43888af3..3d20696d 100644 --- a/src/Build/Resources/MacOSX/Info.plist.xml +++ b/src/Build/Resources/MacOSX/Info.plist.xml @@ -74,7 +74,7 @@ TRUE CFBundleVersion - 1.24.24 + 1.24.25 CFBundleShortVersionString _VERSION_ diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index 0a147ea2..d01ea63b 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-Update8" +#define VERSION_STRING "1.24-Update9" #ifdef VC_EFI_CUSTOM_MODE #define VERSION_STRING_SUFFIX "-CustomEFI" @@ -67,9 +67,9 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift); #define VERSION_NUM 0x0124 // Release date -#define TC_STR_RELEASE_DATE L"December 11, 2020" -#define TC_RELEASE_DATE_YEAR 2020 -#define TC_RELEASE_DATE_MONTH 12 +#define TC_STR_RELEASE_DATE L"January 1, 2021" +#define TC_RELEASE_DATE_YEAR 2021 +#define TC_RELEASE_DATE_MONTH 1 #define BYTES_PER_KB 1024LL #define BYTES_PER_MB 1048576LL diff --git a/src/Driver/Driver.rc b/src/Driver/Driver.rc index faf213a1..58fe96fc 100644 --- a/src/Driver/Driver.rc +++ b/src/Driver/Driver.rc @@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,24,0 - PRODUCTVERSION 1,24,24,0 + FILEVERSION 1,24,25,0 + PRODUCTVERSION 1,24,25,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc index a05833cd..f9fc13d4 100644 --- a/src/ExpandVolume/ExpandVolume.rc +++ b/src/ExpandVolume/ExpandVolume.rc @@ -193,8 +193,8 @@ IDR_MOUNT_RSRC_HEADER HEADER "resource.h" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,24,0 - PRODUCTVERSION 1,24,24,0 + FILEVERSION 1,24,25,0 + PRODUCTVERSION 1,24,25,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -211,11 +211,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Expander" - VALUE "FileVersion", "1.24-Update8" + VALUE "FileVersion", "1.24-Update9" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCryptExpander.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Update8" + VALUE "ProductVersion", "1.24-Update9" END END BLOCK "VarFileInfo" diff --git a/src/Format/Format.rc b/src/Format/Format.rc index 37525a49..a83c5a99 100644 --- a/src/Format/Format.rc +++ b/src/Format/Format.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,24,0 - PRODUCTVERSION 1,24,24,0 + FILEVERSION 1,24,25,0 + PRODUCTVERSION 1,24,25,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,11 +46,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Format" - VALUE "FileVersion", "1.24-Update8" + VALUE "FileVersion", "1.24-Update9" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Format.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Update8" + VALUE "ProductVersion", "1.24-Update9" END END BLOCK "VarFileInfo" diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index f7db6fd3..dab159b6 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -559,8 +559,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,24,0 - PRODUCTVERSION 1,24,24,0 + FILEVERSION 1,24,25,0 + PRODUCTVERSION 1,24,25,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -577,11 +577,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt" - VALUE "FileVersion", "1.24-Update8" + VALUE "FileVersion", "1.24-Update9" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Update8" + VALUE "ProductVersion", "1.24-Update9" END END BLOCK "VarFileInfo" diff --git a/src/Release/Setup Files/veracrypt-x64.cat b/src/Release/Setup Files/veracrypt-x64.cat index 80905a3e..36706341 100644 Binary files a/src/Release/Setup Files/veracrypt-x64.cat and b/src/Release/Setup Files/veracrypt-x64.cat differ diff --git a/src/Release/Setup Files/veracrypt-x64.sys b/src/Release/Setup Files/veracrypt-x64.sys index d3065064..cae02099 100644 Binary files a/src/Release/Setup Files/veracrypt-x64.sys and b/src/Release/Setup Files/veracrypt-x64.sys differ diff --git a/src/Release/Setup Files/veracrypt.Inf b/src/Release/Setup Files/veracrypt.Inf index 10ee9540..2b8fed00 100644 --- a/src/Release/Setup Files/veracrypt.Inf +++ b/src/Release/Setup Files/veracrypt.Inf @@ -2,7 +2,7 @@ ;;; VeraCrypt ;;; ;;; -;;; Copyright (c) 2020, IDRIX +;;; Copyright (c) 2021, IDRIX ;;; [Version] @@ -10,7 +10,7 @@ signature = "$Windows NT$" Class = "Encryption" ;This is determined by the work this filter driver does ClassGuid = {a0a701c0-a511-42ff-aa6c-06dc0395576f} ;This value is determined by the Class Provider = %ProviderString% -DriverVer = 12/11/2020,1.24.24.0 +DriverVer = 01/01/2020,1.24.25.0 CatalogFile = veracrypt.cat diff --git a/src/Release/Setup Files/veracrypt.cat b/src/Release/Setup Files/veracrypt.cat index f28e5546..9fe26bb1 100644 Binary files a/src/Release/Setup Files/veracrypt.cat and b/src/Release/Setup Files/veracrypt.cat differ diff --git a/src/Release/Setup Files/veracrypt.sys b/src/Release/Setup Files/veracrypt.sys index 0c72365d..25f7f8e3 100644 Binary files a/src/Release/Setup Files/veracrypt.sys and b/src/Release/Setup Files/veracrypt.sys differ diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj index 66ba785c..39865a5b 100755 --- a/src/Setup/MacOSX/veracrypt.pkgproj +++ b/src/Setup/MacOSX/veracrypt.pkgproj @@ -555,7 +555,7 @@ USE_HFS+_COMPRESSION VERSION - 1.24.24 + 1.24.25 TYPE 0 @@ -1016,7 +1016,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt 1.24-Update8 + VeraCrypt 1.24-Update9 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 e35defc0..3db3c5d6 100755 --- a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj +++ b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj @@ -555,7 +555,7 @@ USE_HFS+_COMPRESSION VERSION - 1.24.24 + 1.24.25 TYPE 0 @@ -1060,7 +1060,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt Legacy 1.24-Update8 + VeraCrypt Legacy 1.24-Update9 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc index b94c939c..6ffc03c7 100644 --- a/src/Setup/Portable.rc +++ b/src/Setup/Portable.rc @@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,24,0 - PRODUCTVERSION 1,24,24,0 + FILEVERSION 1,24,25,0 + PRODUCTVERSION 1,24,25,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -44,11 +44,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Portable" - VALUE "FileVersion", "1.24-Update8" + VALUE "FileVersion", "1.24-Update9" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Portable.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Update8" + VALUE "ProductVersion", "1.24-Update9" END END BLOCK "VarFileInfo" diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index 778c8c9b..1b80a9fd 100644 --- a/src/Setup/Setup.rc +++ b/src/Setup/Setup.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,24,0 - PRODUCTVERSION 1,24,24,0 + FILEVERSION 1,24,25,0 + PRODUCTVERSION 1,24,25,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,11 +46,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Setup" - VALUE "FileVersion", "1.24-Update8" + VALUE "FileVersion", "1.24-Update9" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Setup.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Update8" + VALUE "ProductVersion", "1.24-Update9" END END BLOCK "VarFileInfo" diff --git a/src/Signing/sign-sha256.bat b/src/Signing/sign-sha256.bat index 799cf126..99cad96d 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-Update8 +set VC_VERSION=1.24-Update9 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% @@ -15,7 +15,8 @@ timeout /t 10 rem sign using SHA-256 signtool sign /v /sha1 04141E4EA6D9343CEC994F6C099DC09BDD8937C9 /ac GlobalSign_R3Cross.cer /as /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Release\Setup Files\veracrypt.sys" "..\Release\Setup Files\veracrypt-x64.sys" -signtool sign /v /sha1 04141E4EA6D9343CEC994F6C099DC09BDD8937C9 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Release\Setup Files\VeraCrypt.exe" "..\Release\Setup Files\VeraCrypt Format.exe" "..\Release\Setup Files\VeraCryptExpander.exe" "..\Release\Setup Files\VeraCrypt-x64.exe" "..\Release\Setup Files\VeraCrypt Format-x64.exe" "..\Release\Setup Files\VeraCryptExpander-x64.exe" +signtool sign /v /sha1 04141E4EA6D9343CEC994F6C099DC09BDD8937C9 /ac GlobalSign_R3Cross.cer /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Release\Setup Files\veracrypt-arm64.sys" +signtool sign /v /sha1 04141E4EA6D9343CEC994F6C099DC09BDD8937C9 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Release\Setup Files\VeraCrypt.exe" "..\Release\Setup Files\VeraCrypt Format.exe" "..\Release\Setup Files\VeraCryptExpander.exe" "..\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" cd "..\Release\Setup Files\" diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat index 125943be..f4efacdd 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-Update8 +set VC_VERSION=1.24-Update9 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat index 0161a9bb..858e545f 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-Update8 +set VC_VERSION=1.24-Update9 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt @@ -20,7 +20,7 @@ signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac %PFXCA% /fd sha1 /t http:/ 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 "..\Release\Setup Files\veracrypt.sys" "..\Release\Setup Files\veracrypt-x64.sys" "..\Release\Setup Files\VeraCrypt.exe" "..\Release\Setup Files\VeraCrypt Format.exe" "..\Release\Setup Files\VeraCryptExpander.exe" "..\Release\Setup Files\VeraCrypt-x64.exe" "..\Release\Setup Files\VeraCrypt Format-x64.exe" "..\Release\Setup Files\VeraCryptExpander-x64.exe" +signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /as /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Release\Setup Files\veracrypt.sys" "..\Release\Setup Files\veracrypt-x64.sys" "..\Release\Setup Files\veracrypt-arm64.sys" "..\Release\Setup Files\VeraCrypt.exe" "..\Release\Setup Files\VeraCrypt Format.exe" "..\Release\Setup Files\VeraCryptExpander.exe" "..\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" cd "..\Release\Setup Files\" diff --git a/src/Signing/sign_test_debug.bat b/src/Signing/sign_test_debug.bat index 397a8cb0..9cf8e562 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-Update8 +set VC_VERSION=1.24-Update9 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt @@ -20,7 +20,7 @@ signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac %PFXCA% /fd sha1 /t http:/ 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.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" +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" cd "..\Debug\Setup Files\" -- cgit v1.2.3