From 2d3771c45d5ff47092d374b7fd5a946c01269834 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Fri, 7 Jan 2022 00:20:34 +0100 Subject: Increment version to 1.25.7 and update Release Notes --- src/Boot/Windows/Release/BootLoader.com.gz | Bin 17290 -> 17290 bytes src/Boot/Windows/Release_AES/BootLoader.com.gz | Bin 11562 -> 11562 bytes src/Boot/Windows/Release_AES_SHA2/BootLoader.com.gz | Bin 11739 -> 11738 bytes src/Boot/Windows/Release_Camellia/BootLoader.com.gz | Bin 12488 -> 12488 bytes .../Windows/Release_Camellia_SHA2/BootLoader.com.gz | Bin 12632 -> 12632 bytes src/Boot/Windows/Release_SHA2/BootLoader.com.gz | Bin 17483 -> 17483 bytes src/Boot/Windows/Release_Serpent/BootLoader.com.gz | Bin 11882 -> 11881 bytes .../Windows/Release_Serpent_SHA2/BootLoader.com.gz | Bin 12052 -> 12051 bytes src/Boot/Windows/Release_Twofish/BootLoader.com.gz | Bin 11524 -> 11525 bytes .../Windows/Release_Twofish_SHA2/BootLoader.com.gz | Bin 11721 -> 11721 bytes src/Boot/Windows/Rescue/BootLoader.com.gz | Bin 17852 -> 17853 bytes src/Boot/Windows/Rescue_AES/BootLoader.com.gz | Bin 12093 -> 12093 bytes src/Boot/Windows/Rescue_AES_SHA2/BootLoader.com.gz | Bin 12278 -> 12278 bytes src/Boot/Windows/Rescue_Camellia/BootLoader.com.gz | Bin 13039 -> 13039 bytes .../Windows/Rescue_Camellia_SHA2/BootLoader.com.gz | Bin 13183 -> 13183 bytes src/Boot/Windows/Rescue_SHA2/BootLoader.com.gz | Bin 18030 -> 18031 bytes src/Boot/Windows/Rescue_Serpent/BootLoader.com.gz | Bin 12419 -> 12420 bytes .../Windows/Rescue_Serpent_SHA2/BootLoader.com.gz | Bin 12598 -> 12598 bytes src/Boot/Windows/Rescue_Twofish/BootLoader.com.gz | Bin 12086 -> 12085 bytes .../Windows/Rescue_Twofish_SHA2/BootLoader.com.gz | Bin 12276 -> 12276 bytes 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 | 4 ++-- src/ExpandVolume/ExpandVolume.rc | 4 ++-- src/Format/Format.rc | 4 ++-- src/Mount/Mount.rc | 4 ++-- src/Release/Setup Files/Product64.wxs | 4 ++-- src/Setup/MacOSX/veracrypt.pkgproj | 4 ++-- src/Setup/MacOSX/veracrypt_Legacy.pkgproj | 4 ++-- src/Setup/Portable.rc | 4 ++-- src/Setup/Setup.rc | 4 ++-- src/Setup/Setup.vcxproj | 14 ++++++++++++++ src/Setup/Setup.vcxproj.filters | 14 ++++++++++++++ src/SetupDLL/Setup.rc | 4 ++-- src/Signing/sign.bat | 4 ++-- src/Signing/sign_TESTSIGNING.bat | 4 ++-- src/Signing/sign_test.bat | 4 ++-- src/Signing/sign_test_debug.bat | 4 ++-- 39 files changed, 60 insertions(+), 32 deletions(-) (limited to 'src') diff --git a/src/Boot/Windows/Release/BootLoader.com.gz b/src/Boot/Windows/Release/BootLoader.com.gz index 6a2a9c22..9f1db6e6 100644 Binary files a/src/Boot/Windows/Release/BootLoader.com.gz and b/src/Boot/Windows/Release/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_AES/BootLoader.com.gz b/src/Boot/Windows/Release_AES/BootLoader.com.gz index 4423eab0..4599e36a 100644 Binary files a/src/Boot/Windows/Release_AES/BootLoader.com.gz and b/src/Boot/Windows/Release_AES/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_AES_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_AES_SHA2/BootLoader.com.gz index 8bd74b44..e851a608 100644 Binary files a/src/Boot/Windows/Release_AES_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Release_AES_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_Camellia/BootLoader.com.gz b/src/Boot/Windows/Release_Camellia/BootLoader.com.gz index 9f56f70a..bd7f976f 100644 Binary files a/src/Boot/Windows/Release_Camellia/BootLoader.com.gz and b/src/Boot/Windows/Release_Camellia/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_Camellia_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_Camellia_SHA2/BootLoader.com.gz index fe543f27..fe4b76de 100644 Binary files a/src/Boot/Windows/Release_Camellia_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Release_Camellia_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_SHA2/BootLoader.com.gz index a02ff71f..81412de3 100644 Binary files a/src/Boot/Windows/Release_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Release_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_Serpent/BootLoader.com.gz b/src/Boot/Windows/Release_Serpent/BootLoader.com.gz index b4cc315d..81784fcc 100644 Binary files a/src/Boot/Windows/Release_Serpent/BootLoader.com.gz and b/src/Boot/Windows/Release_Serpent/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_Serpent_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_Serpent_SHA2/BootLoader.com.gz index ed83ce27..e7ccf708 100644 Binary files a/src/Boot/Windows/Release_Serpent_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Release_Serpent_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_Twofish/BootLoader.com.gz b/src/Boot/Windows/Release_Twofish/BootLoader.com.gz index ee88c6e1..13a43c0e 100644 Binary files a/src/Boot/Windows/Release_Twofish/BootLoader.com.gz and b/src/Boot/Windows/Release_Twofish/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_Twofish_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_Twofish_SHA2/BootLoader.com.gz index 4925df52..5aedbb85 100644 Binary files a/src/Boot/Windows/Release_Twofish_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Release_Twofish_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue/BootLoader.com.gz b/src/Boot/Windows/Rescue/BootLoader.com.gz index 66a7b3ad..29da4d15 100644 Binary files a/src/Boot/Windows/Rescue/BootLoader.com.gz and b/src/Boot/Windows/Rescue/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_AES/BootLoader.com.gz b/src/Boot/Windows/Rescue_AES/BootLoader.com.gz index 10098dec..da0c096c 100644 Binary files a/src/Boot/Windows/Rescue_AES/BootLoader.com.gz and b/src/Boot/Windows/Rescue_AES/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_AES_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_AES_SHA2/BootLoader.com.gz index 7da8d3d6..fbda8050 100644 Binary files a/src/Boot/Windows/Rescue_AES_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Rescue_AES_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_Camellia/BootLoader.com.gz b/src/Boot/Windows/Rescue_Camellia/BootLoader.com.gz index 824d513a..fa5f04c8 100644 Binary files a/src/Boot/Windows/Rescue_Camellia/BootLoader.com.gz and b/src/Boot/Windows/Rescue_Camellia/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_Camellia_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_Camellia_SHA2/BootLoader.com.gz index bd5a0aa3..1c55524b 100644 Binary files a/src/Boot/Windows/Rescue_Camellia_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Rescue_Camellia_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_SHA2/BootLoader.com.gz index 3be33df6..ba34bf3b 100644 Binary files a/src/Boot/Windows/Rescue_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Rescue_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_Serpent/BootLoader.com.gz b/src/Boot/Windows/Rescue_Serpent/BootLoader.com.gz index 51159370..bb52b491 100644 Binary files a/src/Boot/Windows/Rescue_Serpent/BootLoader.com.gz and b/src/Boot/Windows/Rescue_Serpent/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_Serpent_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_Serpent_SHA2/BootLoader.com.gz index a1cd569d..78c246e8 100644 Binary files a/src/Boot/Windows/Rescue_Serpent_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Rescue_Serpent_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_Twofish/BootLoader.com.gz b/src/Boot/Windows/Rescue_Twofish/BootLoader.com.gz index e218ac6d..81e2a072 100644 Binary files a/src/Boot/Windows/Rescue_Twofish/BootLoader.com.gz and b/src/Boot/Windows/Rescue_Twofish/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_Twofish_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_Twofish_SHA2/BootLoader.com.gz index 12c164e6..958228cb 100644 Binary files a/src/Boot/Windows/Rescue_Twofish_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Rescue_Twofish_SHA2/BootLoader.com.gz differ diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt index 875a019c..52b12c54 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.6" ) -set( VERSION "1.25.6" ) +set( FULL_VERSION "1.25.7" ) +set( VERSION "1.25.7" ) 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 0993c78c..2c59b751 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.25.6 + 1.25.7 CFBundleShortVersionString _VERSION_ diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml index d969a853..53e2045a 100644 --- a/src/Build/Resources/MacOSX/Info.plist.xml +++ b/src/Build/Resources/MacOSX/Info.plist.xml @@ -74,7 +74,7 @@ TRUE CFBundleVersion - 1.25.6 + 1.25.7 CFBundleShortVersionString _VERSION_ diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index 64f56501..f8ec9960 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.6" +#define VERSION_STRING "1.25.7" #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"January 3, 2022" +#define TC_STR_RELEASE_DATE L"January 7, 2022" #define TC_RELEASE_DATE_YEAR 2022 #define TC_RELEASE_DATE_MONTH 01 diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc index bc6f9bb2..f37b3324 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,6,0 - PRODUCTVERSION 1,25,6,0 + FILEVERSION 1,25,7,0 + PRODUCTVERSION 1,25,7,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Format/Format.rc b/src/Format/Format.rc index 484ca32a..0114bacd 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,6,0 - PRODUCTVERSION 1,25,6,0 + FILEVERSION 1,25,7,0 + PRODUCTVERSION 1,25,7,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index bb4ce6d6..8f951a79 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -559,8 +559,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,25,6,0 - PRODUCTVERSION 1,25,6,0 + FILEVERSION 1,25,7,0 + PRODUCTVERSION 1,25,7,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Release/Setup Files/Product64.wxs b/src/Release/Setup Files/Product64.wxs index 8067ea1b..8f453a05 100644 --- a/src/Release/Setup Files/Product64.wxs +++ b/src/Release/Setup Files/Product64.wxs @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj index 83999c70..9843c722 100755 --- a/src/Setup/MacOSX/veracrypt.pkgproj +++ b/src/Setup/MacOSX/veracrypt.pkgproj @@ -558,7 +558,7 @@ USE_HFS+_COMPRESSION VERSION - 1.25.6 + 1.25.7 TYPE 0 @@ -1026,7 +1026,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt 1.25.6 + VeraCrypt 1.25.7 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 5463dc76..7075791e 100755 --- a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj +++ b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj @@ -557,7 +557,7 @@ USE_HFS+_COMPRESSION VERSION - 1.25.6 + 1.25.7 TYPE 0 @@ -1062,7 +1062,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt Legacy 1.25.6 + VeraCrypt Legacy 1.25.7 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc index f8351b97..6f6b2f57 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,6,0 - PRODUCTVERSION 1,25,6,0 + FILEVERSION 1,25,7,0 + PRODUCTVERSION 1,25,7,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index f64a1ae2..47f9011e 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,6,0 - PRODUCTVERSION 1,25,6,0 + FILEVERSION 1,25,7,0 + PRODUCTVERSION 1,25,7,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Setup/Setup.vcxproj b/src/Setup/Setup.vcxproj index 622e84ef..3e03eb7d 100644 --- a/src/Setup/Setup.vcxproj +++ b/src/Setup/Setup.vcxproj @@ -279,6 +279,20 @@ copy Debug\VeraCryptSetup.exe "..\Debug\Setup Files\VeraCrypt COMReg.exe" >NU + + + + + + + + + + + + + + diff --git a/src/Setup/Setup.vcxproj.filters b/src/Setup/Setup.vcxproj.filters index d747363f..5b16fbe3 100644 --- a/src/Setup/Setup.vcxproj.filters +++ b/src/Setup/Setup.vcxproj.filters @@ -95,6 +95,20 @@ Resource Files\Common + + + + + + + + + + + + + + diff --git a/src/SetupDLL/Setup.rc b/src/SetupDLL/Setup.rc index c613f042..ed6e80a5 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,6,0 - PRODUCTVERSION 1,25,6,0 + FILEVERSION 1,25,7,0 + PRODUCTVERSION 1,25,7,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat index a35552c6..f02c9494 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.6 -set VC_VERSION_NBRE=1.25.6 +set VC_VERSION=1.25.7 +set VC_VERSION_NBRE=1.25.7 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% diff --git a/src/Signing/sign_TESTSIGNING.bat b/src/Signing/sign_TESTSIGNING.bat index 569fd6fe..146a3157 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.6-TESTSIGNING -set VC_VERSION_NBRE=1.25.6 +set VC_VERSION=1.25.7-TESTSIGNING +set VC_VERSION_NBRE=1.25.7 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat index 3b6d145f..321afce9 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.6 -set VC_VERSION_NBRE=1.25.6 +set VC_VERSION=1.25.7 +set VC_VERSION_NBRE=1.25.7 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 4f3c62fa..bb4fee2c 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.6 -set VC_VERSION_NBRE=1.25.6 +set VC_VERSION=1.25.7 +set VC_VERSION_NBRE=1.25.7 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt -- cgit v1.2.3