From 3a28821b1d3964b2b12546bc919a00bc2571d317 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sun, 21 Nov 2021 20:03:27 +0100 Subject: Increment version to 1.25-RC2 and update release notes --- 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/veracrypt_vs2019.vcxproj | 134 +++++++++++++++++++++++ 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/SetupDLL/Setup.rc | 4 +- src/Signing/sign.bat | 13 ++- src/Signing/sign_test.bat | 4 +- src/Signing/sign_test_debug.bat | 4 +- 17 files changed, 170 insertions(+), 35 deletions(-) (limited to 'src') diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt index cba99cf8..d6d0a7ec 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-RC1" ) -set( VERSION "1.25.1" ) +set( FULL_VERSION "1.25-RC2" ) +set( VERSION "1.25.2" ) 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 3af93d72..8eafcc3d 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.1 + 1.25.2 CFBundleShortVersionString _VERSION_ diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml index d5332fde..54f3fdb4 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.1 + 1.25.2 CFBundleShortVersionString _VERSION_ diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index 1af6c0b1..eb60aca5 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-RC1" +#define VERSION_STRING "1.25-RC2" #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 0x0125 // Release date -#define TC_STR_RELEASE_DATE L"September 5, 2021" +#define TC_STR_RELEASE_DATE L"November 21, 2021" #define TC_RELEASE_DATE_YEAR 2021 -#define TC_RELEASE_DATE_MONTH 9 +#define TC_RELEASE_DATE_MONTH 11 #define BYTES_PER_KB 1024LL #define BYTES_PER_MB 1048576LL diff --git a/src/Driver/veracrypt_vs2019.vcxproj b/src/Driver/veracrypt_vs2019.vcxproj index 6b9d3aef..4c09db94 100644 --- a/src/Driver/veracrypt_vs2019.vcxproj +++ b/src/Driver/veracrypt_vs2019.vcxproj @@ -5,10 +5,18 @@ Debug ARM64 + + Debug + x64 + Release ARM64 + + Release + x64 + @@ -35,17 +43,23 @@ true + true true + true true + true true + true true + true true + true @@ -83,6 +97,16 @@ <_NT_TARGET_VERSION>0x0A00 false + + Windows10 + true + WindowsKernelModeDriver10.0 + Driver + WDM + Universal + <_NT_TARGET_VERSION>0x0A00 + false + Windows10 false @@ -92,6 +116,15 @@ <_NT_TARGET_VERSION>0x0A00 false + + Windows10 + false + WindowsKernelModeDriver10.0 + Driver + WDM + <_NT_TARGET_VERSION>0x0A00 + false + @@ -105,11 +138,19 @@ $(SolutionDir)$(Platform)\$(ConfigurationName)\ veracrypt + + veracrypt + DbgengKernelDebugger + DbgengKernelDebugger $(ProjectDir)$(Platform)\$(ConfigurationName)\ veracrypt + + veracrypt + DbgengKernelDebugger + fltmgr.lib;%(AdditionalDependencies) @@ -127,6 +168,23 @@ false + + + fltmgr.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + + + $(SolutionDir)Common;$(SolutionDir)Crypto;$(SolutionDir);%(AdditionalIncludeDirectories) + TC_WINDOWS_DRIVER;_WIN32;_NO_CRT_STDIO_INLINE;DEBUG;_DEBUG;%(PreprocessorDefinitions) + 4064;4627;4627;4366;4100;4057;4457;4456;4152;4213;4244;4127;4706;%(DisableSpecificWarnings) + + + copy $(TargetPath) "..\Debug\Setup Files\VeraCrypt-arm64.sys" + + + false + + fltmgr.lib;%(AdditionalDependencies) @@ -145,6 +203,24 @@ false + + + fltmgr.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName)$(TargetExt) + + + $(SolutionDir)Common;$(SolutionDir)Crypto;$(SolutionDir);%(AdditionalIncludeDirectories) + TC_WINDOWS_DRIVER;_WIN32;_NO_CRT_STDIO_INLINE;%(PreprocessorDefinitions) + 4064;4627;4627;4366;4100;4057;4457;4456;4152;4213;4244;4127;4706;%(DisableSpecificWarnings) + + + copy $(TargetPath) "..\Release\Setup Files\VeraCrypt-arm64.sys" + + + true + false + + @@ -188,58 +264,84 @@ echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -g -o "$(TargetDir)\%(Filename).obj" "%(FullPath)" + + echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -g -o "$(TargetDir)\%(Filename).obj" "%(FullPath)" echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -g -o "$(TargetDir)\%(Filename).obj" "%(FullPath)" + + echo %(Filename)%(Extension) & nasm.exe -Xvc -f win64 -Ox -g -o "$(TargetDir)\%(Filename).obj" "%(FullPath)" $(TargetDir)\%(Filename).obj;%(Outputs) + $(TargetDir)\%(Filename).obj;%(Outputs) $(TargetDir)\%(Filename).obj;%(Outputs) + $(TargetDir)\%(Filename).obj;%(Outputs) true + true true + true true + true true + true echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox -g --prefix _ -o "$(TargetDir)\%(Filename).obj" "%(FullPath)" + + echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox -g --prefix _ -o "$(TargetDir)\%(Filename).obj" "%(FullPath)" echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox -g --prefix _ -o "$(TargetDir)\%(Filename).obj" "%(FullPath)" + + echo %(Filename)%(Extension) & nasm.exe -Xvc -f win32 -Ox -g --prefix _ -o "$(TargetDir)\%(Filename).obj" "%(FullPath)" $(TargetDir)\%(Filename).obj;%(Outputs) + $(TargetDir)\%(Filename).obj;%(Outputs) $(TargetDir)\%(Filename).obj;%(Outputs) + $(TargetDir)\%(Filename).obj;%(Outputs) true + true true + true true + true true + true Document true + true true + true Document true + true true + true Document true + true true + true @@ -251,82 +353,114 @@ Document true + true true + true Document true + true true + true Document true + true true + true Document true + true true + true Document true + true true + true Document true + true true + true Document true + true true + true Document true + true true + true Document echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)" + + echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)" echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)" + + echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)" $(TargetDir)\%(Filename).obj;%(Outputs) + $(TargetDir)\%(Filename).obj;%(Outputs) $(TargetDir)\%(Filename).obj;%(Outputs) + $(TargetDir)\%(Filename).obj;%(Outputs) true + true true + true Document echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)" + + echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)" echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)" + + echo %(Filename)%(Extension) & ml64.exe /nologo /D_M_X64 /W3 /Cx /Zi /Fo "$(TargetDir)\%(Filename).obj" /c "%(FullPath)" $(TargetDir)\%(Filename).obj;%(Outputs) + $(TargetDir)\%(Filename).obj;%(Outputs) $(TargetDir)\%(Filename).obj;%(Outputs) + $(TargetDir)\%(Filename).obj;%(Outputs) true + true true + true diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc index 72943470..9463f4ef 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,1,0 - PRODUCTVERSION 1,25,1,0 + FILEVERSION 1,25,2,0 + PRODUCTVERSION 1,25,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Format/Format.rc b/src/Format/Format.rc index 72ab9b2e..db7034d1 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,1,0 - PRODUCTVERSION 1,25,1,0 + FILEVERSION 1,25,2,0 + PRODUCTVERSION 1,25,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index 32f3abd2..803c2820 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -559,8 +559,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,25,1,0 - PRODUCTVERSION 1,25,1,0 + FILEVERSION 1,25,2,0 + PRODUCTVERSION 1,25,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Release/Setup Files/Product64.wxs b/src/Release/Setup Files/Product64.wxs index 125d739a..50c4419c 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 9e6b25ec..f2d0f1df 100755 --- a/src/Setup/MacOSX/veracrypt.pkgproj +++ b/src/Setup/MacOSX/veracrypt.pkgproj @@ -557,7 +557,7 @@ USE_HFS+_COMPRESSION VERSION - 1.25.1 + 1.25.2 TYPE 0 @@ -1025,7 +1025,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt 1.25-RC1 + VeraCrypt 1.25-RC2 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 c3480254..a99296b6 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.1 + 1.25.2 TYPE 0 @@ -1062,7 +1062,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt Legacy 1.25-RC1 + VeraCrypt Legacy 1.25-RC2 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc index fe6f8a43..24d1a56f 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,1,0 - PRODUCTVERSION 1,25,1,0 + FILEVERSION 1,25,2,0 + PRODUCTVERSION 1,25,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index af2d6b14..6de0fbaf 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,1,0 - PRODUCTVERSION 1,25,1,0 + FILEVERSION 1,25,2,0 + PRODUCTVERSION 1,25,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/SetupDLL/Setup.rc b/src/SetupDLL/Setup.rc index 984db229..7be5a926 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,1,0 - PRODUCTVERSION 1,25,1,0 + FILEVERSION 1,25,2,0 + PRODUCTVERSION 1,25,2,0 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat index 696277fa..b422e40a 100644 --- a/src/Signing/sign.bat +++ b/src/Signing/sign.bat @@ -1,17 +1,18 @@ PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip -set VC_VERSION=1.25-RC1 -set VC_VERSION_NBRE=1.25.1 +set VC_VERSION=1.25-RC2 +set VC_VERSION_NBRE=1.25.2 set SIGNINGPATH=%~dp0 cd %SIGNINGPATH% -call "..\..\doc\chm\create_chm.bat" +rem call "..\..\doc\chm\create_chm.bat" cd %SIGNINGPATH% rem sign using SHA-256 -signtool sign /v /sha1 2B174F12D921AF2FF576D867BE91E97E4ADC7D07 /ac GlobalSign_R3Cross.cer /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Release\Setup Files\veracrypt.sys" "..\Release\Setup Files\veracrypt-x64.sys" "..\Release\Setup Files\veracrypt-arm64.sys" -signtool sign /v /sha1 2B174F12D921AF2FF576D867BE91E97E4ADC7D07 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Release\Setup Files\VeraCrypt.exe" "..\Release\Setup Files\VeraCrypt Format.exe" "..\Release\Setup Files\VeraCryptExpander.exe" "..\Release\Setup Files\VeraCrypt-x64.exe" "..\Release\Setup Files\VeraCrypt Format-x64.exe" "..\Release\Setup Files\VeraCryptExpander-x64.exe" "..\Release\Setup Files\VeraCrypt-arm64.exe" "..\Release\Setup Files\VeraCrypt Format-arm64.exe" "..\Release\Setup Files\VeraCryptExpander-arm64.exe" "..\Release\Setup Files\VeraCrypt COMReg.exe" "..\Release\Setup Files\VeraCryptSetup.dll" +signtool sign /v /sha1 2B174F12D921AF2FF576D867BE91E97E4ADC7D07 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\veracrypt.sys" "..\Release\Setup Files\veracrypt-x64.sys" "..\Release\Setup Files\veracrypt-arm64.sys" + +signtool sign /v /sha1 2B174F12D921AF2FF576D867BE91E97E4ADC7D07 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\VeraCrypt.exe" "..\Release\Setup Files\VeraCrypt Format.exe" "..\Release\Setup Files\VeraCryptExpander.exe" "..\Release\Setup Files\VeraCrypt-x64.exe" "..\Release\Setup Files\VeraCrypt Format-x64.exe" "..\Release\Setup Files\VeraCryptExpander-x64.exe" "..\Release\Setup Files\VeraCrypt-arm64.exe" "..\Release\Setup Files\VeraCrypt Format-arm64.exe" "..\Release\Setup Files\VeraCryptExpander-arm64.exe" "..\Release\Setup Files\VeraCrypt COMReg.exe" "..\Release\Setup Files\VeraCryptSetup.dll" rem create setup and MSI cd "..\Release\Setup Files\" @@ -57,6 +58,6 @@ rmdir /S /Q docs cd %SIGNINGPATH% rem sign Setup using SHA-256 -signtool sign /v /sha1 2B174F12D921AF2FF576D867BE91E97E4ADC7D07 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Release\Setup Files\VeraCrypt Setup %VC_VERSION%.exe" "..\Release\Setup Files\VeraCrypt Portable %VC_VERSION%.exe" "..\Release\Setup Files\bin\VeraCrypt_%VC_VERSION_NBRE%_Setup_x64.msi" "..\Release\Setup Files\bin\VeraCrypt_%VC_VERSION_NBRE%_Setup_x64_en-us.msi" +signtool sign /v /sha1 2B174F12D921AF2FF576D867BE91E97E4ADC7D07 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\VeraCrypt Setup %VC_VERSION%.exe" "..\Release\Setup Files\VeraCrypt Portable %VC_VERSION%.exe" "..\Release\Setup Files\bin\VeraCrypt_%VC_VERSION_NBRE%_Setup_x64.msi" "..\Release\Setup Files\bin\VeraCrypt_%VC_VERSION_NBRE%_Setup_x64_en-us.msi" pause diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat index d71b1996..46634be4 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-RC1 -set VC_VERSION_NBRE=1.25.1 +set VC_VERSION=1.25-RC2 +set VC_VERSION_NBRE=1.25.2 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 a31456b2..f322a072 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-RC1 -set VC_VERSION_NBRE=1.25.1 +set VC_VERSION=1.25-RC2 +set VC_VERSION_NBRE=1.25.2 set PFXNAME=TestCertificate\idrix_codeSign.pfx set PFXPASSWORD=idrix set PFXCA=TestCertificate\idrix_TestRootCA.crt -- cgit v1.2.3