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

Add new entry in XML files for Argon2 memory cost. Increment version to 1.26.25

Browse Source
This commit is contained in:
Mounir IDRASSI
2025-06-25 20:32:09 +09:00
parent 3c17b8ced2
commit ab2937c889
66 changed files with 146 additions and 97 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.26.24" )
set( VERSION "1.26.24" )
set( FULL_VERSION "1.26.25" )
set( VERSION "1.26.25" )
set( RELEASE "1" )
# - Set PROJECT_NAME and CONFLICT_PACKAGE values

8
src/COMReg/COMReg.rc
View File

@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,26,24,0
PRODUCTVERSION 1,26,24,0
FILEVERSION 1,26,25,0
PRODUCTVERSION 1,26,25,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -45,11 +45,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "AM Crypto"
VALUE "FileDescription", "VeraCrypt COMReg"
VALUE "FileVersion", "1.26.24"
VALUE "FileVersion", "1.26.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt COMReg.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.24"
VALUE "ProductVersion", "1.26.25"
END
END
BLOCK "VarFileInfo"

1
src/Common/Language.xml
View File

@@ -1646,6 +1646,7 @@
<entry lang="en" key="INSECURE_MODE">[INSECURE MODE]</entry>
<entry lang="en" key="IDC_DISABLE_SCREEN_PROTECTION">Disable protection against screenshots and screen recording</entry>
<entry lang="en" key="DISABLE_SCREEN_PROTECTION_WARNING">WARNING: Disabling screen protection significantly reduces security. Enable this option ONLY if you have a specific need to capture VeraCrypt's interface. This may expose sensitive data to screenshot tools and screen recording features such as Windows 11 Recall.</entry>
<entry lang="en" key="MEMORY_COST">Memory Cost</entry>
</localization>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="VeraCrypt">

6
src/Common/Tcdefs.h
View File

@@ -59,7 +59,7 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
#define TC_APP_NAME "VeraCrypt"
// Version displayed to user
#define VERSION_STRING "1.26.24"
#define VERSION_STRING "1.26.25"
#ifdef VC_EFI_CUSTOM_MODE
#define VERSION_STRING_SUFFIX "-CustomEFI"
@@ -73,9 +73,9 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
#define VERSION_NUM 0x0126
// Release date
#define TC_STR_RELEASE_DATE L"May 30, 2025"
#define TC_STR_RELEASE_DATE L"June 25, 2025"
#define TC_RELEASE_DATE_YEAR 2025
#define TC_RELEASE_DATE_MONTH 5
#define TC_RELEASE_DATE_MONTH 6
#define BYTES_PER_KB 1024LL
#define BYTES_PER_MB 1048576LL

8
src/Driver/Driver.rc
View File

@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,26,24,0
PRODUCTVERSION 1,26,24,0
FILEVERSION 1,26,25,0
PRODUCTVERSION 1,26,25,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -45,11 +45,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "AM Crypto"
VALUE "FileDescription", "VeraCrypt Driver"
VALUE "FileVersion", "1.26.24"
VALUE "FileVersion", "1.26.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "veracrypt.sys"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.24"
VALUE "ProductVersion", "1.26.25"
END
END
BLOCK "VarFileInfo"

6
src/Driver/Driver.vcxproj
View File

@@ -240,12 +240,16 @@ copy $(OutDir)veracrypt.inf "$(SolutionDir)Debug\Setup Files\veracrypt.inf"</Com
<ClCompile Include="..\Crypto\Argon2\src\opt_avx2.c">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\Crypto\Argon2\src\opt_sse2.c">
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<EnableEnhancedInstructionSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">StreamingSIMDExtensions2</EnableEnhancedInstructionSet>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\Crypto\Argon2\src\ref.c" />
<ClCompile Include="..\Crypto\Argon2\src\selftest.c" />
@@ -641,6 +645,8 @@ copy $(OutDir)veracrypt.inf "$(SolutionDir)Debug\Setup Files\veracrypt.inf"</Com
<Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">echo %(Filename)%(Extension) &amp; yasm.exe -D WINABI -D __YASM__ -f win64 -o "$(TargetDir)\%(Filename).obj" -l "$(TargetDir)\%(Filename).lst" "%(FullPath)"</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(TargetDir)\%(Filename).obj;%(Outputs)</Outputs>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

8
src/ExpandVolume/ExpandVolume.rc
View File

@@ -192,8 +192,8 @@ IDR_MOUNT_RSRC_HEADER HEADER "resource.h"
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,26,24,0
PRODUCTVERSION 1,26,24,0
FILEVERSION 1,26,25,0
PRODUCTVERSION 1,26,25,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -210,11 +210,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "AM Crypto"
VALUE "FileDescription", "VeraCrypt Expander"
VALUE "FileVersion", "1.26.24"
VALUE "FileVersion", "1.26.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCryptExpander.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.24"
VALUE "ProductVersion", "1.26.25"
END
END
BLOCK "VarFileInfo"

8
src/Format/Format.rc
View File

@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,26,24,0
PRODUCTVERSION 1,26,24,0
FILEVERSION 1,26,25,0
PRODUCTVERSION 1,26,25,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "AM Crypto"
VALUE "FileDescription", "VeraCrypt Format"
VALUE "FileVersion", "1.26.24"
VALUE "FileVersion", "1.26.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt Format.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.24"
VALUE "ProductVersion", "1.26.25"
END
END
BLOCK "VarFileInfo"

8
src/FormatDLL/FormatDLL.rc
View File

@@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,26,24,0
PRODUCTVERSION 1,26,24,0
FILEVERSION 1,26,25,0
PRODUCTVERSION 1,26,25,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -43,11 +43,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "AM Crypto"
VALUE "FileDescription", "VeraCrypt Format SDK"
VALUE "FileVersion", "1.26.24"
VALUE "FileVersion", "1.26.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCryptFormat.dll"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.24"
VALUE "ProductVersion", "1.26.25"
END
END
BLOCK "VarFileInfo"

8
src/Mount/Mount.rc
View File

@@ -563,8 +563,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,26,24,0
PRODUCTVERSION 1,26,24,0
FILEVERSION 1,26,25,0
PRODUCTVERSION 1,26,25,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -581,11 +581,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "AM Crypto"
VALUE "FileDescription", "VeraCrypt"
VALUE "FileVersion", "1.26.24"
VALUE "FileVersion", "1.26.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.24"
VALUE "ProductVersion", "1.26.25"
END
END
BLOCK "VarFileInfo"

BIN
src/Release/Setup Files/veracrypt-arm64.cat
View File

Binary file not shown.

BIN
src/Release/Setup Files/veracrypt-arm64.sys
View File

Binary file not shown.

BIN
src/Release/Setup Files/veracrypt-x64.cat
View File

Binary file not shown.

2
src/Release/Setup Files/veracrypt.Inf
View File

@@ -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 = 05/29/2025,1.26.24.0
DriverVer = 06/25/2025,1.26.25.0
CatalogFile = veracrypt.cat
PnpLockdown = 1

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

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

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

@@ -557,7 +557,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
<string>1.26.24</string>
<string>1.26.25</string>
</dict>
<key>TYPE</key>
<integer>0</integer>

4
src/Setup/MacOSX/veracrypt_fuse-t.pkgproj
View File

@@ -557,7 +557,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
<string>1.26.24</string>
<string>1.26.25</string>
</dict>
<key>TYPE</key>
<integer>0</integer>
@@ -1024,7 +1024,7 @@ https://github.com/macos-fuse-t/fuse-t/releases
</dict>
</array>
<key>NAME</key>
<string>VeraCrypt 1.26.24</string>
<string>VeraCrypt 1.26.25</string>
<key>PAYLOAD_ONLY</key>
<false/>
<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>

8
src/Setup/Portable.rc
View File

@@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,26,24,0
PRODUCTVERSION 1,26,24,0
FILEVERSION 1,26,25,0
PRODUCTVERSION 1,26,25,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,11 +44,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "AM Crypto"
VALUE "FileDescription", "VeraCrypt Portable"
VALUE "FileVersion", "1.26.24"
VALUE "FileVersion", "1.26.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt Portable.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.24"
VALUE "ProductVersion", "1.26.25"
END
END
BLOCK "VarFileInfo"

8
src/Setup/Setup.rc
View File

@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,26,24,0
PRODUCTVERSION 1,26,24,0
FILEVERSION 1,26,25,0
PRODUCTVERSION 1,26,25,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "AM Crypto"
VALUE "FileDescription", "VeraCrypt Setup"
VALUE "FileVersion", "1.26.24"
VALUE "FileVersion", "1.26.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt Setup.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.24"
VALUE "ProductVersion", "1.26.25"
END
END
BLOCK "VarFileInfo"

8
src/SetupDLL/Setup.rc
View File

@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,26,24,0
PRODUCTVERSION 1,26,24,0
FILEVERSION 1,26,25,0
PRODUCTVERSION 1,26,25,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "AM Crypto"
VALUE "FileDescription", "VeraCryptSetup"
VALUE "FileVersion", "1.26.24"
VALUE "FileVersion", "1.26.25"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCryptSetup.dll"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.24"
VALUE "ProductVersion", "1.26.25"
END
END
BLOCK "VarFileInfo"

4
src/Signing/sign.bat
View File

@@ -1,7 +1,7 @@
PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86
set VC_VERSION=1.26.24
set VC_VERSION_NBRE=1.26.24
set VC_VERSION=1.26.25
set VC_VERSION_NBRE=1.26.25
set SIGNINGPATH=%~dp0
cd %SIGNINGPATH%

4
src/Signing/sign_TESTSIGNING.bat
View File

@@ -1,7 +1,7 @@
PATH=%PATH%;%WSDK81%\bin\x86
set VC_VERSION=1.26.24
set VC_VERSION_NBRE=1.26.24
set VC_VERSION=1.26.25
set VC_VERSION_NBRE=1.26.25
set SIGNINGPATH=%~dp0
cd %SIGNINGPATH%

4
src/Signing/sign_test.bat
View File

@@ -1,6 +1,6 @@
PATH=%PATH%;%WSDK81%\bin\x86
set VC_VERSION=1.26.24
set VC_VERSION_NBRE=1.26.24
set VC_VERSION=1.26.25
set VC_VERSION_NBRE=1.26.25
set PFXNAME=TestCertificate\idrix_codeSign.pfx
set PFXPASSWORD=idrix
set PFXCA=TestCertificate\idrix_TestRootCA.crt

4
src/Signing/sign_test_debug.bat
View File

@@ -1,6 +1,6 @@
PATH=%PATH%;%WSDK81%\bin\x86
set VC_VERSION=1.26.24
set VC_VERSION_NBRE=1.26.24
set VC_VERSION=1.26.25
set VC_VERSION_NBRE=1.26.25
set PFXNAME=TestCertificate\idrix_codeSign.pfx
set PFXPASSWORD=idrix
set PFXCA=TestCertificate\idrix_TestRootCA.crt