Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 19:08:26 -06:00
Code Activity

Increment version to 1.25.4 and set release date to December 3rd 2021

Browse Source
This commit is contained in:
Mounir IDRASSI
2021-11-30 23:41:27 +01:00
parent 0790b17488
commit bf9866e812
60 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Build/CMakeLists.txt
View File

@@ -11,8 +11,8 @@ elseif ( NOT DEFINED NOGUI )
endif()
# - Set version of the package
set( FULL_VERSION "1.25" )
set( VERSION "1.25.3" )
set( FULL_VERSION "1.25.4" )
set( VERSION "1.25.4" )
set( RELEASE "1" )
# - Set PROJECT_NAME and CONFLICT_PACKAGE values

2
src/Build/Resources/MacOSX/Info.plist.legacy.xml
View File

@@ -74,7 +74,7 @@
<string>TRUE</string>
<key>CFBundleVersion</key>
<string>1.25.3</string>
<string>1.25.4</string>
<key>CFBundleShortVersionString</key>
<string>_VERSION_</string>

2
src/Build/Resources/MacOSX/Info.plist.xml
View File

@@ -74,7 +74,7 @@
<string>TRUE</string>
<key>CFBundleVersion</key>
<string>1.25.3</string>
<string>1.25.4</string>
<key>CFBundleShortVersionString</key>
<string>_VERSION_</string>

6
src/Common/Tcdefs.h
View File

@@ -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"
#define VERSION_STRING "1.25.4"
#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"November 29, 2021"
#define TC_STR_RELEASE_DATE L"December 3, 2021"
#define TC_RELEASE_DATE_YEAR 2021
#define TC_RELEASE_DATE_MONTH 11
#define TC_RELEASE_DATE_MONTH 12
#define BYTES_PER_KB 1024LL
#define BYTES_PER_MB 1048576LL

4
src/Driver/Driver.rc
View File

@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,25,3,0
PRODUCTVERSION 1,25,3,0
FILEVERSION 1,25,4,0
PRODUCTVERSION 1,25,4,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L

4
src/ExpandVolume/ExpandVolume.rc
View File

@@ -193,8 +193,8 @@ IDR_MOUNT_RSRC_HEADER HEADER "resource.h"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,25,3,0
PRODUCTVERSION 1,25,3,0
FILEVERSION 1,25,4,0
PRODUCTVERSION 1,25,4,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L

4
src/Format/Format.rc
View File

@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,25,3,0
PRODUCTVERSION 1,25,3,0
FILEVERSION 1,25,4,0
PRODUCTVERSION 1,25,4,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L

4
src/Mount/Mount.rc
View File

@@ -559,8 +559,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,25,3,0
PRODUCTVERSION 1,25,3,0
FILEVERSION 1,25,4,0
PRODUCTVERSION 1,25,4,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L

4
src/Release/Setup Files/Product64.wxs
View File

@@ -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.3?>
<?define var.FullProductVersion = 1.25.4?>
<?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 = {20CFEEFB-4DAC-4E7B-8298-885C2F8296D2}?>
<?define var.ProductGuid = {E98D0556-21EF-410C-BB53-35A4533B7126}?>
<!-- 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 -->

8
src/Release/Setup Files/build_msi_x64.bat
View File

@@ -118,7 +118,7 @@ cd %MSI_BUILDPATH%
@if NOT "%ERRORLEVEL%" == "0" goto msi_failed
"%VC_DIR_WIX%\candle.exe" -dLang=en -arch x64 -ext WixUIExtension -ext WiXUtilExtension Custom_InstallDirDlg.wxs -out out\64\en-us\Custom_InstallDirDlg.wixobj
@if NOT "%ERRORLEVEL%" == "0" goto msi_failed
"%VC_DIR_WIX%\Light.exe" -ext WixUIExtension -ext WiXUtilExtension -cultures:en-us -loc Strings-en.wxl out\64\en-us\Product.wixobj out\64\en-us\Custom_InstallDirDlg.wixobj out\64\en-us\Custom_InstallDir.wixobj -out out\64\en-us\VeraCrypt_%1_Setup_en-us.msi -pdbout out\64\en-us\VeraCrypt_%1_Setup_en-us.wixpdb -sice:ICE09
"%VC_DIR_WIX%\Light.exe" -ext WixUIExtension -ext WiXUtilExtension -cultures:en-us -loc Strings-en.wxl out\64\en-us\Product.wixobj out\64\en-us\Custom_InstallDirDlg.wixobj out\64\en-us\Custom_InstallDir.wixobj -out out\64\en-us\VeraCrypt_Setup_%1_en-us.msi -pdbout out\64\en-us\VeraCrypt_Setup_%1_en-us.wixpdb -sice:ICE09
@if NOT "%ERRORLEVEL%" == "0" goto msi_failed
::------------------------------------
@@ -129,8 +129,8 @@ cd %MSI_BUILDPATH%
@set OUT_PATH=%cd%\out\64\
@echo [INFO] OUT_PATH=%OUT_PATH%
@set MSI_FILE_IN=VeraCrypt_%1_Setup
@set MSI_FILE_OUT=VeraCrypt_%1_Setup_x64
@set MSI_FILE_IN=VeraCrypt_Setup_%1
@set MSI_FILE_OUT=VeraCrypt_Setup_x64_%1
:: Check if all the MSI files were built
@set LANG=en-us
@@ -152,7 +152,7 @@ cd %MSI_BUILDPATH%
mkdir bin
@copy /Y "%OUT_PATH%\%MSI_FILE_OUT%.msi" "%cd%\bin\%MSI_FILE_OUT%.msi"
@set LANG=en-us
@copy /Y "%OUT_PATH%\%LANG%\%MSI_FILE_IN%_%LANG%.msi" "%cd%\bin\%MSI_FILE_IN%_x64_%LANG%.msi"
@copy /Y "%OUT_PATH%\%LANG%\%MSI_FILE_IN%_%LANG%.msi" "%cd%\bin\%MSI_FILE_OUT%_%LANG%.msi"
@rmdir /S /Q "%cd%\out"
goto END

4
src/Setup/MacOSX/veracrypt.pkgproj
View File

@@ -557,7 +557,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
<string>1.25.3</string>
<string>1.25.4</string>
</dict>
<key>TYPE</key>
<integer>0</integer>
@@ -1025,7 +1025,7 @@ https://osxfuse.github.io/
</dict>
</array>
<key>NAME</key>
<string>VeraCrypt 1.25</string>
<string>VeraCrypt 1.25.4</string>
<key>PAYLOAD_ONLY</key>
<false/>
<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>

4
src/Setup/MacOSX/veracrypt_Legacy.pkgproj
View File

@@ -557,7 +557,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
<string>1.25.3</string>
<string>1.25.4</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</string>
<string>VeraCrypt Legacy 1.25.4</string>
<key>PAYLOAD_ONLY</key>
<false/>
<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>

4
src/Setup/Portable.rc
View File

@@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,25,3,0
PRODUCTVERSION 1,25,3,0
FILEVERSION 1,25,4,0
PRODUCTVERSION 1,25,4,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L

4
src/Setup/Setup.rc
View File

@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,25,3,0
PRODUCTVERSION 1,25,3,0
FILEVERSION 1,25,4,0
PRODUCTVERSION 1,25,4,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L

4
src/SetupDLL/Setup.rc
View File

@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,25,3,0
PRODUCTVERSION 1,25,3,0
FILEVERSION 1,25,4,0
PRODUCTVERSION 1,25,4,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L

6
src/Signing/sign.bat
View File

@@ -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
set VC_VERSION_NBRE=1.25.3
set VC_VERSION=1.25.4
set VC_VERSION_NBRE=1.25.4
set SIGNINGPATH=%~dp0
cd %SIGNINGPATH%
@@ -58,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://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"
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_Setup_x64_%VC_VERSION_NBRE%.msi" "..\Release\Setup Files\bin\VeraCrypt_Setup_x64_%VC_VERSION_NBRE%_en-us.msi"
pause

6
src/Signing/sign_test.bat
View File

@@ -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
set VC_VERSION_NBRE=1.25.3
set VC_VERSION=1.25.4
set VC_VERSION_NBRE=1.25.4
set PFXNAME=TestCertificate\idrix_codeSign.pfx
set PFXPASSWORD=idrix
set PFXCA=TestCertificate\idrix_TestRootCA.crt
@@ -76,6 +76,6 @@ rem dual-sign Setup using SHA-256
signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /as /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Release\Setup Files\VeraCrypt Setup %VC_VERSION%.exe"
rem single sign MSI using SHA-256
signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\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 /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Release\Setup Files\bin\VeraCrypt_Setup_x64_%VC_VERSION_NBRE%.msi" "..\Release\Setup Files\bin\VeraCrypt_Setup_x64_%VC_VERSION_NBRE%_en-us.msi"
pause

6
src/Signing/sign_test_debug.bat
View File

@@ -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
set VC_VERSION_NBRE=1.25.3
set VC_VERSION=1.25.4
set VC_VERSION_NBRE=1.25.4
set PFXNAME=TestCertificate\idrix_codeSign.pfx
set PFXPASSWORD=idrix
set PFXCA=TestCertificate\idrix_TestRootCA.crt
@@ -74,6 +74,6 @@ rem dual-sign Setup using SHA-256
signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /as /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Debug\Setup Files\VeraCrypt Setup %VC_VERSION%.exe"
rem single sign MSI using SHA-256
signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Debug\Setup Files\bin\VeraCrypt_%VC_VERSION_NBRE%_Setup_x64.msi" "..\Debug\Setup Files\bin\VeraCrypt_%VC_VERSION_NBRE%_Setup_x64_en-us.msi"
signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Debug\Setup Files\bin\VeraCrypt_Setup_x64_%VC_VERSION_NBRE%.msi" "..\Debug\Setup Files\bin\VeraCrypt_Setup_x64_%VC_VERSION_NBRE%_en-us.msi"
pause