From 406adce424b923ea4713c3da8787363f660b26b7 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Wed, 9 Jan 2019 11:28:51 +0100 Subject: Increment version to 1.24-Beta1 --- Translations/Language.ar.xml | 2 +- Translations/Language.be.xml | 2 +- Translations/Language.bg.xml | 2 +- Translations/Language.ca.xml | 2 +- Translations/Language.cs.xml | 2 +- Translations/Language.da.xml | 2 +- Translations/Language.de.xml | 2 +- Translations/Language.el.xml | 2 +- Translations/Language.es.xml | 2 +- Translations/Language.et.xml | 2 +- Translations/Language.eu.xml | 2 +- Translations/Language.fa.xml | 2 +- Translations/Language.fi.xml | 2 +- Translations/Language.fr.xml | 2 +- Translations/Language.hu.xml | 2 +- Translations/Language.id.xml | 2 +- Translations/Language.it.xml | 2 +- Translations/Language.ja.xml | 2 +- Translations/Language.ka.xml | 2 +- Translations/Language.ko.xml | 2 +- Translations/Language.lv.xml | 2 +- Translations/Language.my.xml | 2 +- Translations/Language.nl.xml | 2 +- Translations/Language.nn.xml | 2 +- Translations/Language.pl.xml | 2 +- Translations/Language.pt-br.xml | 2 +- Translations/Language.ro.xml | 2 +- Translations/Language.ru.xml | 2 +- Translations/Language.sk.xml | 2 +- Translations/Language.sl.xml | 2 +- Translations/Language.sv.xml | 2 +- Translations/Language.th.xml | 2 +- Translations/Language.tr.xml | 2 +- Translations/Language.uk.xml | 2 +- Translations/Language.uz.xml | 2 +- Translations/Language.vi.xml | 2 +- Translations/Language.zh-cn.xml | 2 +- Translations/Language.zh-hk.xml | 2 +- Translations/Language.zh-tw.xml | 2 +- src/Common/Tcdefs.h | 10 ++++++---- 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 10583 -> 10789 bytes src/Release/Setup Files/veracrypt-x64.sys | Bin 829144 -> 830384 bytes src/Release/Setup Files/veracrypt.Inf | 2 +- src/Release/Setup Files/veracrypt.cat | Bin 10531 -> 10725 bytes src/Release/Setup Files/veracrypt.sys | Bin 768728 -> 769440 bytes 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 +- 54 files changed, 71 insertions(+), 69 deletions(-) diff --git a/Translations/Language.ar.xml b/Translations/Language.ar.xml index 7bd3300d..29363048 100644 --- a/Translations/Language.ar.xml +++ b/Translations/Language.ar.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.be.xml b/Translations/Language.be.xml index 9ca884ce..8f5caa2d 100644 --- a/Translations/Language.be.xml +++ b/Translations/Language.be.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.bg.xml b/Translations/Language.bg.xml index aeae30c4..6a09bb5e 100644 --- a/Translations/Language.bg.xml +++ b/Translations/Language.bg.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.ca.xml b/Translations/Language.ca.xml index 1c57d294..0521ab34 100644 --- a/Translations/Language.ca.xml +++ b/Translations/Language.ca.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.cs.xml b/Translations/Language.cs.xml index 819936e6..308db36b 100644 --- a/Translations/Language.cs.xml +++ b/Translations/Language.cs.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.da.xml b/Translations/Language.da.xml index fac2d104..5911972a 100644 --- a/Translations/Language.da.xml +++ b/Translations/Language.da.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.de.xml b/Translations/Language.de.xml index f30c84f5..8b9b51c8 100644 --- a/Translations/Language.de.xml +++ b/Translations/Language.de.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.el.xml b/Translations/Language.el.xml index d26c8b4f..7784ba88 100644 --- a/Translations/Language.el.xml +++ b/Translations/Language.el.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.es.xml b/Translations/Language.es.xml index 02d88397..46fd5da6 100644 --- a/Translations/Language.es.xml +++ b/Translations/Language.es.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.et.xml b/Translations/Language.et.xml index 50f22b22..9a117c82 100644 --- a/Translations/Language.et.xml +++ b/Translations/Language.et.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.eu.xml b/Translations/Language.eu.xml index 415ca8bf..6c601553 100644 --- a/Translations/Language.eu.xml +++ b/Translations/Language.eu.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.fa.xml b/Translations/Language.fa.xml index 0bb6a849..241a6a54 100644 --- a/Translations/Language.fa.xml +++ b/Translations/Language.fa.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.fi.xml b/Translations/Language.fi.xml index cc51140c..9d258b94 100644 --- a/Translations/Language.fi.xml +++ b/Translations/Language.fi.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.fr.xml b/Translations/Language.fr.xml index 549e3048..550f6ca4 100644 --- a/Translations/Language.fr.xml +++ b/Translations/Language.fr.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.hu.xml b/Translations/Language.hu.xml index eff55f75..d2e8190b 100644 --- a/Translations/Language.hu.xml +++ b/Translations/Language.hu.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.id.xml b/Translations/Language.id.xml index 8371cadf..974aa060 100644 --- a/Translations/Language.id.xml +++ b/Translations/Language.id.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.it.xml b/Translations/Language.it.xml index ba2a49e1..9fb318e2 100644 --- a/Translations/Language.it.xml +++ b/Translations/Language.it.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.ja.xml b/Translations/Language.ja.xml index b79a65a9..cdb86cb4 100644 --- a/Translations/Language.ja.xml +++ b/Translations/Language.ja.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.ka.xml b/Translations/Language.ka.xml index a4d2eef3..c8399ef7 100644 --- a/Translations/Language.ka.xml +++ b/Translations/Language.ka.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.ko.xml b/Translations/Language.ko.xml index 0d7478eb..cc1eac66 100644 --- a/Translations/Language.ko.xml +++ b/Translations/Language.ko.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.lv.xml b/Translations/Language.lv.xml index 9bbe6e2f..f469f410 100644 --- a/Translations/Language.lv.xml +++ b/Translations/Language.lv.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.my.xml b/Translations/Language.my.xml index 69f74c32..9bbd7396 100644 --- a/Translations/Language.my.xml +++ b/Translations/Language.my.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.nl.xml b/Translations/Language.nl.xml index ce2d6cd7..a4018c88 100644 --- a/Translations/Language.nl.xml +++ b/Translations/Language.nl.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.nn.xml b/Translations/Language.nn.xml index 62cb3684..c0274ede 100644 --- a/Translations/Language.nn.xml +++ b/Translations/Language.nn.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.pl.xml b/Translations/Language.pl.xml index f216eca5..fe517cb1 100644 --- a/Translations/Language.pl.xml +++ b/Translations/Language.pl.xml @@ -1,6 +1,6 @@  - + diff --git a/Translations/Language.pt-br.xml b/Translations/Language.pt-br.xml index f1cb6bfa..e5f7afd6 100644 --- a/Translations/Language.pt-br.xml +++ b/Translations/Language.pt-br.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.ro.xml b/Translations/Language.ro.xml index e92b41ef..90e6c6a6 100644 --- a/Translations/Language.ro.xml +++ b/Translations/Language.ro.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.ru.xml b/Translations/Language.ru.xml index b300bb9d..a63e91d4 100644 --- a/Translations/Language.ru.xml +++ b/Translations/Language.ru.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.sk.xml b/Translations/Language.sk.xml index 53046607..42936fcf 100644 --- a/Translations/Language.sk.xml +++ b/Translations/Language.sk.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.sl.xml b/Translations/Language.sl.xml index 8cd16474..882bd6b4 100644 --- a/Translations/Language.sl.xml +++ b/Translations/Language.sl.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.sv.xml b/Translations/Language.sv.xml index 3f042f5a..4924b6f5 100644 --- a/Translations/Language.sv.xml +++ b/Translations/Language.sv.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.th.xml b/Translations/Language.th.xml index bb4dcf07..4c636d5c 100644 --- a/Translations/Language.th.xml +++ b/Translations/Language.th.xml @@ -1,6 +1,6 @@  - + diff --git a/Translations/Language.tr.xml b/Translations/Language.tr.xml index 0e4134fa..eb39f099 100644 --- a/Translations/Language.tr.xml +++ b/Translations/Language.tr.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.uk.xml b/Translations/Language.uk.xml index 2360ed95..a996b608 100644 --- a/Translations/Language.uk.xml +++ b/Translations/Language.uk.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.uz.xml b/Translations/Language.uz.xml index bf45dd42..4661852b 100644 --- a/Translations/Language.uz.xml +++ b/Translations/Language.uz.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.vi.xml b/Translations/Language.vi.xml index 5ad3d9b5..880db7b5 100644 --- a/Translations/Language.vi.xml +++ b/Translations/Language.vi.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.zh-cn.xml b/Translations/Language.zh-cn.xml index 305b0338..2b677fff 100644 --- a/Translations/Language.zh-cn.xml +++ b/Translations/Language.zh-cn.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.zh-hk.xml b/Translations/Language.zh-hk.xml index ecad0e2b..79b42bbb 100644 --- a/Translations/Language.zh-hk.xml +++ b/Translations/Language.zh-hk.xml @@ -1,6 +1,6 @@ - + diff --git a/Translations/Language.zh-tw.xml b/Translations/Language.zh-tw.xml index ddda9f1f..20cb08a1 100644 --- a/Translations/Language.zh-tw.xml +++ b/Translations/Language.zh-tw.xml @@ -1,6 +1,6 @@ - + diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index fb454e79..388bfd11 100644 --- a/src/Common/Tcdefs.h +++ b/src/Common/Tcdefs.h @@ -55,15 +55,15 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift); #define TC_APP_NAME "VeraCrypt" // Version displayed to user -#define VERSION_STRING "1.24-Beta0" +#define VERSION_STRING "1.24-Beta1" // Version number to compare against driver #define VERSION_NUM 0x0124 // Release date -#define TC_STR_RELEASE_DATE L"December 18, 2018" -#define TC_RELEASE_DATE_YEAR 2018 -#define TC_RELEASE_DATE_MONTH 12 +#define TC_STR_RELEASE_DATE L"January 8, 2018" +#define TC_RELEASE_DATE_YEAR 2019 +#define TC_RELEASE_DATE_MONTH 1 #define BYTES_PER_KB 1024LL #define BYTES_PER_MB 1048576LL @@ -356,6 +356,8 @@ extern VOID NTAPI KeRestoreExtendedProcessorState ( #define burn(mem,size) do { volatile char *burnm = (volatile char *)(mem); int burnc = size; while (burnc--) *burnm++ = 0; } while (0) #endif +#define volatile_memcpy(d,s,size) do { volatile char *destm = (volatile char *)(d); volatile char *srcm = (volatile char *)(s); size_t memc = size; while (memc--) *destm++ = *srcm++; } while (0) + // The size of the memory area to wipe is in bytes amd it must be a multiple of 8. #ifndef TC_NO_COMPILER_INT64 # define FAST_ERASE64(mem,size) do { volatile uint64 *burnm = (volatile uint64 *)(mem); int burnc = size >> 3; while (burnc--) *burnm++ = 0; } while (0) diff --git a/src/Driver/Driver.rc b/src/Driver/Driver.rc index 307f2c72..fbffecf1 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,0,1 - PRODUCTVERSION 1,24,0,1 + FILEVERSION 1,24,1,0 + PRODUCTVERSION 1,24,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc index 447ab29c..6878b317 100644 --- a/src/ExpandVolume/ExpandVolume.rc +++ b/src/ExpandVolume/ExpandVolume.rc @@ -192,8 +192,8 @@ IDR_MOUNT_RSRC_HEADER HEADER "resource.h" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,0,0 - PRODUCTVERSION 1,24,0,0 + FILEVERSION 1,24,1,0 + PRODUCTVERSION 1,24,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -210,11 +210,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Expander" - VALUE "FileVersion", "1.24-Beta0" + VALUE "FileVersion", "1.24-Beta1" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCryptExpander.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Beta0" + VALUE "ProductVersion", "1.24-Beta1" END END BLOCK "VarFileInfo" diff --git a/src/Format/Format.rc b/src/Format/Format.rc index b6f4c8e2..173f1c6c 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,0,0 - PRODUCTVERSION 1,24,0,0 + FILEVERSION 1,24,1,0 + PRODUCTVERSION 1,24,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,11 +46,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Format" - VALUE "FileVersion", "1.24-Beta0" + VALUE "FileVersion", "1.24-Beta1" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Format.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Beta0" + VALUE "ProductVersion", "1.24-Beta1" END END BLOCK "VarFileInfo" diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index c4306b17..3011b5d9 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -538,8 +538,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,24,0,0 - PRODUCTVERSION 1,24,0,0 + FILEVERSION 1,24,1,0 + PRODUCTVERSION 1,24,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -556,11 +556,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt" - VALUE "FileVersion", "1.24-Beta0" + VALUE "FileVersion", "1.24-Beta1" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Beta0" + VALUE "ProductVersion", "1.24-Beta1" END END BLOCK "VarFileInfo" diff --git a/src/Release/Setup Files/veracrypt-x64.cat b/src/Release/Setup Files/veracrypt-x64.cat index 6145d2da..c202bf71 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 33d4853c..3fb7cf48 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 50e5657d..ce64cc57 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 = 12/18/2018,1.24.0.1 +DriverVer = 01/08/2019,1.24.1.0 CatalogFile = veracrypt.cat diff --git a/src/Release/Setup Files/veracrypt.cat b/src/Release/Setup Files/veracrypt.cat index 9693f227..bfc9c524 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 79e8e658..ba36840e 100644 Binary files a/src/Release/Setup Files/veracrypt.sys and b/src/Release/Setup Files/veracrypt.sys differ diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc index 8756d8fc..2daacd8a 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,0,0 - PRODUCTVERSION 1,24,0,0 + FILEVERSION 1,24,1,0 + PRODUCTVERSION 1,24,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -44,11 +44,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Portable" - VALUE "FileVersion", "1.24-Beta0" + VALUE "FileVersion", "1.24-Beta1" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Portable.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Beta0" + VALUE "ProductVersion", "1.24-Beta1" END END BLOCK "VarFileInfo" diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index 2d67a63d..e85bb344 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,0,0 - PRODUCTVERSION 1,24,0,0 + FILEVERSION 1,24,1,0 + PRODUCTVERSION 1,24,1,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,11 +46,11 @@ BEGIN BEGIN VALUE "CompanyName", "IDRIX" VALUE "FileDescription", "VeraCrypt Setup" - VALUE "FileVersion", "1.24-Beta0" + VALUE "FileVersion", "1.24-Beta1" VALUE "LegalTrademarks", "VeraCrypt" VALUE "OriginalFilename", "VeraCrypt Setup.exe" VALUE "ProductName", "VeraCrypt" - VALUE "ProductVersion", "1.24-Beta0" + VALUE "ProductVersion", "1.24-Beta1" END END BLOCK "VarFileInfo" diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat index 1c3bd2af..2e8531bf 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-Beta0 +set VC_VERSION=1.24-Beta1 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat index 24633a2a..9acb97db 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-Beta0 +set VC_VERSION=1.24-Beta1 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 292cfb7c..db552db1 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-Beta0 +set VC_VERSION=1.24-Beta1 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt -- cgit v1.2.3