VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2021-11-28 00:47:30 +0100
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2021-11-28 00:50:35 +0100
commit1dc9ec2499729e4a6dbb0d8736d3f7e967943113 (patch)
treeca55d1983754f49ce005ca88fc6958bfa09e3b0b /src
parente7b3ca7334a502ceea28f8680b9583e0efb13f30 (diff)
downloadVeraCrypt-1dc9ec2499729e4a6dbb0d8736d3f7e967943113.tar.gz
VeraCrypt-1dc9ec2499729e4a6dbb0d8736d3f7e967943113.zip
Increment version to 1.25 (1.25.3)
Diffstat (limited to 'src')
-rw-r--r--src/Build/CMakeLists.txt4
-rw-r--r--src/Build/Resources/MacOSX/Info.plist.legacy.xml2
-rw-r--r--src/Build/Resources/MacOSX/Info.plist.xml2
-rw-r--r--src/Common/Tcdefs.h4
-rw-r--r--src/Driver/Driver.rc4
-rw-r--r--src/ExpandVolume/ExpandVolume.rc4
-rw-r--r--src/Format/Format.rc4
-rw-r--r--src/Mount/Mount.rc4
-rw-r--r--src/Release/Setup Files/Product64.wxs4
-rwxr-xr-xsrc/Setup/MacOSX/veracrypt.pkgproj4
-rwxr-xr-xsrc/Setup/MacOSX/veracrypt_Legacy.pkgproj4
-rw-r--r--src/Setup/Portable.rc4
-rw-r--r--src/Setup/Setup.rc4
-rw-r--r--src/SetupDLL/Setup.rc4
-rw-r--r--src/Signing/sign.bat6
-rw-r--r--src/Signing/sign_test.bat4
-rw-r--r--src/Signing/sign_test_debug.bat4
17 files changed, 33 insertions, 33 deletions
diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt
index d6d0a7ec..529f0e84 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-RC2" )
-set( VERSION "1.25.2" )
+set( FULL_VERSION "1.25" )
+set( VERSION "1.25.3" )
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 8eafcc3d..89bd93ce 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.2</string>
+ <string>1.25.3</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 54f3fdb4..95f5baa7 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.2</string>
+ <string>1.25.3</string>
<key>CFBundleShortVersionString</key>
<string>_VERSION_</string>
diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h
index eb60aca5..5689a9ee 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-RC2"
+#define VERSION_STRING "1.25"
#ifdef VC_EFI_CUSTOM_MODE
#define VERSION_STRING_SUFFIX "-CustomEFI"
@@ -67,7 +67,7 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
#define VERSION_NUM 0x0125
// Release date
-#define TC_STR_RELEASE_DATE L"November 21, 2021"
+#define TC_STR_RELEASE_DATE L"November 29, 2021"
#define TC_RELEASE_DATE_YEAR 2021
#define TC_RELEASE_DATE_MONTH 11
diff --git a/src/Driver/Driver.rc b/src/Driver/Driver.rc
index dbb81ba2..0184983e 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,2,0
- PRODUCTVERSION 1,25,2,0
+ FILEVERSION 1,25,3,0
+ PRODUCTVERSION 1,25,3,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc
index 9463f4ef..14ce9f35 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,2,0
- PRODUCTVERSION 1,25,2,0
+ FILEVERSION 1,25,3,0
+ PRODUCTVERSION 1,25,3,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/Format/Format.rc b/src/Format/Format.rc
index db7034d1..dfa00f2d 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,2,0
- PRODUCTVERSION 1,25,2,0
+ FILEVERSION 1,25,3,0
+ PRODUCTVERSION 1,25,3,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc
index 803c2820..e04fcf7b 100644
--- a/src/Mount/Mount.rc
+++ b/src/Mount/Mount.rc
@@ -559,8 +559,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,25,2,0
- PRODUCTVERSION 1,25,2,0
+ FILEVERSION 1,25,3,0
+ PRODUCTVERSION 1,25,3,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/Release/Setup Files/Product64.wxs b/src/Release/Setup Files/Product64.wxs
index 50c4419c..e524e810 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.2?>
+ <?define var.FullProductVersion = 1.25.3?>
<?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 = {4C68CCE9-E67D-4892-89AE-145C707E317C}?>
+ <?define var.ProductGuid = {20CFEEFB-4DAC-4E7B-8298-885C2F8296D2}?>
<!-- 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/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj
index f2d0f1df..bbfe5086 100755
--- a/src/Setup/MacOSX/veracrypt.pkgproj
+++ b/src/Setup/MacOSX/veracrypt.pkgproj
@@ -557,7 +557,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
- <string>1.25.2</string>
+ <string>1.25.3</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-RC2</string>
+ <string>VeraCrypt 1.25</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 a99296b6..c03503ab 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.2</string>
+ <string>1.25.3</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-RC2</string>
+ <string>VeraCrypt Legacy 1.25</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 24d1a56f..5df8ff68 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,2,0
- PRODUCTVERSION 1,25,2,0
+ FILEVERSION 1,25,3,0
+ PRODUCTVERSION 1,25,3,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc
index 6de0fbaf..334bb6b8 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,2,0
- PRODUCTVERSION 1,25,2,0
+ FILEVERSION 1,25,3,0
+ PRODUCTVERSION 1,25,3,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/SetupDLL/Setup.rc b/src/SetupDLL/Setup.rc
index 7be5a926..1e2697ac 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,2,0
- PRODUCTVERSION 1,25,2,0
+ FILEVERSION 1,25,3,0
+ PRODUCTVERSION 1,25,3,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat
index b422e40a..435517f4 100644
--- a/src/Signing/sign.bat
+++ b/src/Signing/sign.bat
@@ -1,11 +1,11 @@
PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
-set VC_VERSION=1.25-RC2
-set VC_VERSION_NBRE=1.25.2
+set VC_VERSION=1.25
+set VC_VERSION_NBRE=1.25.3
set SIGNINGPATH=%~dp0
cd %SIGNINGPATH%
-rem call "..\..\doc\chm\create_chm.bat"
+call "..\..\doc\chm\create_chm.bat"
cd %SIGNINGPATH%
diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat
index 46634be4..b001e03f 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-RC2
-set VC_VERSION_NBRE=1.25.2
+set VC_VERSION=1.25
+set VC_VERSION_NBRE=1.25.3
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 f322a072..5696029a 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-RC2
-set VC_VERSION_NBRE=1.25.2
+set VC_VERSION=1.25
+set VC_VERSION_NBRE=1.25.3
set PFXNAME=TestCertificate\idrix_codeSign.pfx
set PFXPASSWORD=idrix
set PFXCA=TestCertificate\idrix_TestRootCA.crt