Increment version to 1.24-Beta1

2025-11-11 11:08:02 -06:00 · 2019-01-09 11:28:51 +01:00
parent 405883169c
commit 406adce424
54 changed files with 71 additions and 69 deletions
--- 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)
--- 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
--- 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"
--- 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"
--- 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"
--- a/Files/veracrypt-x64.cat
+++ b/Files/veracrypt-x64.cat
--- a/Files/veracrypt-x64.sys
+++ b/Files/veracrypt-x64.sys
--- a/Files/veracrypt.Inf
+++ b/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


--- a/Files/veracrypt.cat
+++ b/Files/veracrypt.cat
--- a/Files/veracrypt.sys
+++ b/Files/veracrypt.sys
--- 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"
--- 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"
--- 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%

--- 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
--- 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