From 4587472e8787daf936e63cda35145cd1a363721a Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Mon, 4 Nov 2019 23:22:56 +0100 Subject: Increment version to 1.24-Hotfix2 --- 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 | 6 +++--- 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 10615 -> 10607 bytes src/Release/Setup Files/veracrypt-x64.sys | Bin 828256 -> 829272 bytes src/Release/Setup Files/veracrypt.Inf | 2 +- src/Release/Setup Files/veracrypt.cat | Bin 10768 -> 10551 bytes src/Release/Setup Files/veracrypt.sys | Bin 766640 -> 767320 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.bat | 2 +- src/Signing/sign_test.bat | 2 +- src/Signing/sign_test_debug.bat | 2 +- 20 files changed, 37 insertions(+), 37 deletions(-) (limited to 'src') diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt index 837c63ee..4724339e 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-Hotfix1" ) -set( VERSION "1.24.7" ) +set( FULL_VERSION "1.24-Hotfix2" ) +set( VERSION "1.24.8" ) 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 4874768f..7ecb3c2f 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.7 + 1.24.8 CFBundleShortVersionString _VERSION_ diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml index 47f70f6c..4df84a08 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.7 + 1.24.8 CFBundleShortVersionString _VERSION_ diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index b9f3756f..4e8cfa49 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-Hotfix1" +#define VERSION_STRING "1.24-Hotfix2" #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"October 27, 2019" +#define TC_STR_RELEASE_DATE L"November 4, 2019" #define TC_RELEASE_DATE_YEAR 2019 -#define TC_RELEASE_DATE_MONTH 10 +#define TC_RELEASE_DATE_MONTH 11 #define BYTES_PER_KB 1024LL #define BYTES_PER_MB 1048576LL diff --git a/src/Driver/Driver.rc b/src/Driver/Driver.rc index c96e096e..e2040cab 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,6,0 - PRODUCTVERSION 1,24,6,0 + FILEVERSION 1,24,8,0 + PRODUCTVERSION 1,24,8,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc index ea310b3f..860130ea 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,7,1 - PRODUCTVERSION 1,24,7,1 + FILEVERSION 1,24,8,0 + PRODUCTVERSION 1,24,8,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -211,11 +211,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Expander" - VALUE "FileVersion", "1.24-Hotfix1" + VALUE "FileVersion", "1.24-Hotfix2" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCryptExpander.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Hotfix1" + VALUE "ProductVersion", "1.24-Hotfix2" END END BLOCK "VarFileInfo" diff --git a/src/Format/Format.rc b/src/Format/Format.rc index 43cd208f..01ee4a5b 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,7,1 - PRODUCTVERSION 1,24,7,1 + FILEVERSION 1,24,8,0 + PRODUCTVERSION 1,24,8,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,11 +46,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Format" - VALUE "FileVersion", "1.24-Hotfix1" + VALUE "FileVersion", "1.24-Hotfix2" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Format.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Hotfix1" + VALUE "ProductVersion", "1.24-Hotfix2" END END BLOCK "VarFileInfo" diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index 4fb1477c..275559ea 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -548,8 +548,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,7,1 - PRODUCTVERSION 1,24,7,1 + FILEVERSION 1,24,8,0 + PRODUCTVERSION 1,24,8,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -566,11 +566,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt" - VALUE "FileVersion", "1.24-Hotfix1" + VALUE "FileVersion", "1.24-Hotfix2" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Hotfix1" + VALUE "ProductVersion", "1.24-Hotfix2" END END BLOCK "VarFileInfo" diff --git a/src/Release/Setup Files/veracrypt-x64.cat b/src/Release/Setup Files/veracrypt-x64.cat index 0668d0b3..be3716ad 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 92793af5..d0e8e84d 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 5ddf0833..b7c75260 100644 --- a/src/Release/Setup Files/veracrypt.Inf +++ b/src/Release/Setup Files/veracrypt.Inf @@ -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 = 10/01/2019,1.24.6.0 +DriverVer = 11/04/2019,1.24.8.0 CatalogFile = veracrypt.cat diff --git a/src/Release/Setup Files/veracrypt.cat b/src/Release/Setup Files/veracrypt.cat index 7a5aba50..06c128a0 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 884fb781..9841e018 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 409e578f..55a3e0b0 100755 --- a/src/Setup/MacOSX/veracrypt.pkgproj +++ b/src/Setup/MacOSX/veracrypt.pkgproj @@ -555,7 +555,7 @@ USE_HFS+_COMPRESSION VERSION - 1.24.7 + 1.24.8 TYPE 0 @@ -1059,7 +1059,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt 1.24-Hotfix1 + VeraCrypt 1.24-Hotfix2 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 bbfa7ce7..d941bf20 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.7 + 1.24.8 TYPE 0 @@ -1059,7 +1059,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt Legacy 1.24-Hotfix1 + VeraCrypt Legacy 1.24-Hotfix2 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc index 574b660a..a8664731 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,7,1 - PRODUCTVERSION 1,24,7,1 + FILEVERSION 1,24,8,0 + PRODUCTVERSION 1,24,8,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -44,11 +44,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Portable" - VALUE "FileVersion", "1.24-Hotfix1" + VALUE "FileVersion", "1.24-Hotfix2" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Portable.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Hotfix1" + VALUE "ProductVersion", "1.24-Hotfix2" END END BLOCK "VarFileInfo" diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index 066710ea..02957c01 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,7,1 - PRODUCTVERSION 1,24,7,1 + FILEVERSION 1,24,8,0 + PRODUCTVERSION 1,24,8,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,11 +46,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Setup" - VALUE "FileVersion", "1.24-Hotfix1" + VALUE "FileVersion", "1.24-Hotfix2" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Setup.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Hotfix1" + VALUE "ProductVersion", "1.24-Hotfix2" END END BLOCK "VarFileInfo" diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat index 59772f47..eb40b44a 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-Hotfix1 +set VC_VERSION=1.24-Hotfix2 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat index a2b0078a..6bf92895 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-Hotfix1 +set VC_VERSION=1.24-Hotfix2 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt diff --git a/src/Signing/sign_test_debug.bat b/src/Signing/sign_test_debug.bat index 55814341..8c98ebc5 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-Hotfix1 +set VC_VERSION=1.24-Hotfix2 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt -- cgit v1.2.3