diff options
Diffstat (limited to 'src')
25 files changed, 36 insertions, 35 deletions
diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt index 2024318b..875a019c 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.25.5" ) -set( VERSION "1.25.5" ) +set( FULL_VERSION "1.25.6" ) +set( VERSION "1.25.6" ) 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 0ca679c2..0993c78c 100644 --- a/src/Build/Resources/MacOSX/Info.plist.legacy.xml +++ b/src/Build/Resources/MacOSX/Info.plist.legacy.xml @@ -74,7 +74,7 @@ <string>TRUE</string> <key>CFBundleVersion</key> - <string>1.25.5</string> + <string>1.25.6</string> <key>CFBundleShortVersionString</key> <string>_VERSION_</string> diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml index 8f701350..d969a853 100644 --- a/src/Build/Resources/MacOSX/Info.plist.xml +++ b/src/Build/Resources/MacOSX/Info.plist.xml @@ -74,7 +74,7 @@ <string>TRUE</string> <key>CFBundleVersion</key> - <string>1.25.5</string> + <string>1.25.6</string> <key>CFBundleShortVersionString</key> <string>_VERSION_</string> diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index 50ee5392..4aa4bfe5 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.25.5" +#define VERSION_STRING "1.25.6" #ifdef VC_EFI_CUSTOM_MODE #define VERSION_STRING_SUFFIX "-CustomEFI" @@ -69,7 +69,7 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift); #define VERSION_NUM 0x0125 // Release date -#define TC_STR_RELEASE_DATE L"December 24, 2021" +#define TC_STR_RELEASE_DATE L"December 27, 2021" #define TC_RELEASE_DATE_YEAR 2021 #define TC_RELEASE_DATE_MONTH 12 diff --git a/src/Driver/Driver.rc b/src/Driver/Driver.rc index 8a75eda2..a695b9cd 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,25,5,1 - PRODUCTVERSION 1,25,5,1 + FILEVERSION 1,25,6,0 + PRODUCTVERSION 1,25,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc index c3a15488..bc6f9bb2 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,25,5,0 - PRODUCTVERSION 1,25,5,0 + FILEVERSION 1,25,6,0 + PRODUCTVERSION 1,25,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Format/Format.rc b/src/Format/Format.rc index a2549dd2..484ca32a 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,25,5,0 - PRODUCTVERSION 1,25,5,0 + FILEVERSION 1,25,6,0 + PRODUCTVERSION 1,25,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index 70c114eb..bb4ce6d6 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -559,8 +559,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,25,5,0 - PRODUCTVERSION 1,25,5,0 + FILEVERSION 1,25,6,0 + PRODUCTVERSION 1,25,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Release/Setup Files/Product64.wxs b/src/Release/Setup Files/Product64.wxs index 2958bdea..8067ea1b 100644 --- a/src/Release/Setup Files/Product64.wxs +++ b/src/Release/Setup Files/Product64.wxs @@ -4,7 +4,7 @@ <!-- FullProductVersion's first 3 parts MUST BE incremented at each release in order for upgrades to work ; Windows Installer ignores the 4th part --> - <?define var.FullProductVersion = 1.25.5?> + <?define var.FullProductVersion = 1.25.6?> <?define var.ProductName = VeraCrypt $(var.FullProductVersion)?> <!-- Unique GUID identifying this family of product (32-bit and 64-bit have the same) --> @@ -12,7 +12,7 @@ <!-- Unique GUID identifying this product release (32-bit and 64-bit have different ones) --> <!-- MUST BE regenerated for each new release --> - <?define var.ProductGuid = {FB801A9D-C7E9-49FE-8818-073980435072}?> + <?define var.ProductGuid = {873AA4D3-482F-49D8-9594-BCF28CF93132}?> <!-- Unique GUID identifying a particular Windows Installer package --> <!-- When compiling a product, it should not be set in order to allow it to be generated for each build --> diff --git a/src/Release/Setup Files/veracrypt-arm64.cat b/src/Release/Setup Files/veracrypt-arm64.cat Binary files differindex 84caf80f..73360d66 100644 --- a/src/Release/Setup Files/veracrypt-arm64.cat +++ b/src/Release/Setup Files/veracrypt-arm64.cat diff --git a/src/Release/Setup Files/veracrypt-arm64.sys b/src/Release/Setup Files/veracrypt-arm64.sys Binary files differindex e2d75dea..8974d293 100644 --- a/src/Release/Setup Files/veracrypt-arm64.sys +++ b/src/Release/Setup Files/veracrypt-arm64.sys diff --git a/src/Release/Setup Files/veracrypt-x64.cat b/src/Release/Setup Files/veracrypt-x64.cat Binary files differindex 365c4ea1..206155cc 100644 --- a/src/Release/Setup Files/veracrypt-x64.cat +++ b/src/Release/Setup Files/veracrypt-x64.cat diff --git a/src/Release/Setup Files/veracrypt-x64.sys b/src/Release/Setup Files/veracrypt-x64.sys Binary files differindex 0ce46ece..8d4f5a39 100644 --- a/src/Release/Setup Files/veracrypt-x64.sys +++ b/src/Release/Setup Files/veracrypt-x64.sys diff --git a/src/Release/Setup Files/veracrypt.Inf b/src/Release/Setup Files/veracrypt.Inf index 04894b8d..d8abd1f8 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 = 11/21/2021,1.25.2.0 +DriverVer = 12/27/2021,1.25.6.0 CatalogFile = veracrypt.cat diff --git a/src/Release/Setup Files/veracrypt.cat b/src/Release/Setup Files/veracrypt.cat Binary files differindex 9c8c5763..25504c70 100644 --- a/src/Release/Setup Files/veracrypt.cat +++ b/src/Release/Setup Files/veracrypt.cat diff --git a/src/Release/Setup Files/veracrypt.sys b/src/Release/Setup Files/veracrypt.sys Binary files differindex 18d716fd..3e085d07 100644 --- a/src/Release/Setup Files/veracrypt.sys +++ b/src/Release/Setup Files/veracrypt.sys diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj index 2619a294..83999c70 100755 --- a/src/Setup/MacOSX/veracrypt.pkgproj +++ b/src/Setup/MacOSX/veracrypt.pkgproj @@ -1,4 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> +<?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> <plist version="1.0"> <dict> @@ -557,7 +558,7 @@ <key>USE_HFS+_COMPRESSION</key> <false/> <key>VERSION</key> - <string>1.25.5</string> + <string>1.25.6</string> </dict> <key>TYPE</key> <integer>0</integer> @@ -1025,7 +1026,7 @@ https://osxfuse.github.io/ </dict> </array> <key>NAME</key> - <string>VeraCrypt 1.25.5</string> + <string>VeraCrypt 1.25.6</string> <key>PAYLOAD_ONLY</key> <false/> <key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key> diff --git a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj index f2f6e7e1..5463dc76 100755 --- a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj +++ b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj @@ -557,7 +557,7 @@ <key>USE_HFS+_COMPRESSION</key> <false/> <key>VERSION</key> - <string>1.25.5</string> + <string>1.25.6</string> </dict> <key>TYPE</key> <integer>0</integer> @@ -1062,7 +1062,7 @@ https://osxfuse.github.io/ </dict> </array> <key>NAME</key> - <string>VeraCrypt Legacy 1.25.5</string> + <string>VeraCrypt Legacy 1.25.6</string> <key>PAYLOAD_ONLY</key> <false/> <key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key> diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc index 94578ddf..f8351b97 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,25,5,0 - PRODUCTVERSION 1,25,5,0 + FILEVERSION 1,25,6,0 + PRODUCTVERSION 1,25,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index de83b129..91ddc62b 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,25,5,0 - PRODUCTVERSION 1,25,5,0 + FILEVERSION 1,25,6,0 + PRODUCTVERSION 1,25,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/SetupDLL/Setup.rc b/src/SetupDLL/Setup.rc index d4635f23..c613f042 100644 --- a/src/SetupDLL/Setup.rc +++ b/src/SetupDLL/Setup.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,25,5,0 - PRODUCTVERSION 1,25,5,0 + FILEVERSION 1,25,6,0 + PRODUCTVERSION 1,25,6,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat index 4bd77155..ee2c553d 100644 --- a/src/Signing/sign.bat +++ b/src/Signing/sign.bat @@ -1,7 +1,7 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.25.5 -set VC_VERSION_NBRE=1.25.5 +set VC_VERSION=1.25.6 +set VC_VERSION_NBRE=1.25.6 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% diff --git a/src/Signing/sign_TESTSIGNING.bat b/src/Signing/sign_TESTSIGNING.bat index ea38ffbc..e1ed40a6 100644 --- a/src/Signing/sign_TESTSIGNING.bat +++ b/src/Signing/sign_TESTSIGNING.bat @@ -1,7 +1,7 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.25.5-TESTSIGNING -set VC_VERSION_NBRE=1.25.5 +set VC_VERSION=1.25.6-TESTSIGNING +set VC_VERSION_NBRE=1.25.6 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat index 59d43f90..3b6d145f 100644 --- a/src/Signing/sign_test.bat +++ b/src/Signing/sign_test.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.25.5 -set VC_VERSION_NBRE=1.25.5 +set VC_VERSION=1.25.6 +set VC_VERSION_NBRE=1.25.6 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 bb3ec97f..4f3c62fa 100644 --- a/src/Signing/sign_test_debug.bat +++ b/src/Signing/sign_test_debug.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.25.5 -set VC_VERSION_NBRE=1.25.5 +set VC_VERSION=1.25.6 +set VC_VERSION_NBRE=1.25.6 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt |