From 847da0ccdfddf1f79f53d26711b75c65248a3061 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Thu, 6 Aug 2020 18:47:08 +0200
Subject: Increment internal version to 1.24.23 and update release notes

---
 doc/chm/VeraCrypt User Guide.chm                 | Bin 1914542 -> 1914606 bytes
 doc/html/Release Notes.html                      |   3 ++-
 src/Build/CMakeLists.txt                         |   2 +-
 src/Build/Resources/MacOSX/Info.plist.legacy.xml |   2 +-
 src/Build/Resources/MacOSX/Info.plist.xml        |   2 +-
 src/Common/Tcdefs.h                              |   2 +-
 src/ExpandVolume/ExpandVolume.rc                 |   4 ++--
 src/Format/Format.rc                             |   4 ++--
 src/Mount/Mount.rc                               |   4 ++--
 src/Setup/MacOSX/veracrypt.pkgproj               |   2 +-
 src/Setup/MacOSX/veracrypt_Legacy.pkgproj        |   2 +-
 src/Setup/Portable.rc                            |   4 ++--
 src/Setup/Setup.rc                               |   4 ++--
 13 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/doc/chm/VeraCrypt User Guide.chm b/doc/chm/VeraCrypt User Guide.chm
index 7bb00e75..43037a94 100644
Binary files a/doc/chm/VeraCrypt User Guide.chm and b/doc/chm/VeraCrypt User Guide.chm differ
diff --git a/doc/html/Release Notes.html b/doc/html/Release Notes.html
index 3c4ccfdf..d1171111 100644
--- a/doc/html/Release Notes.html	
+++ b/doc/html/Release Notes.html	
@@ -39,7 +39,7 @@
 <strong>Note to users who created volumes with 1.17 version of VeraCrypt or earlier: </strong><br/>
 <span style="color:#ff0000;">To avoid hinting whether your volumes contain a hidden volume or not, or if you depend on plausible deniability when using hidden volumes/OS, then you must recreate both the outer and hidden volumes including system encryption and hidden OS, discarding existing volumes created prior to 1.18a version of VeraCrypt.</span></li>
 </p>
-<p><strong style="text-align:left">1.24-Update7</strong> (August 5<sup>th</sup>, 2020):</p>
+<p><strong style="text-align:left">1.24-Update7</strong> (August 6<sup>th</sup>, 2020):</p>
 <ul>
 <li><strong>All OSes:</strong>
 <ul>
@@ -69,6 +69,7 @@
 <li>MBR bootloader: fix incorrect compressed data size passed to decompressor in boot sector.</li>
 <li>Add warning message when typed password reaches maximum length during the system encryption wizard.</li>
 <li>Fix wrong error message when UTF-8 encoding of entered password exceeds the maximum supported length.</li>
+<li>Fix crash when using portable 32-bit "VeraCrypt Format.exe" to create hidden volume on a 64-bit machine where VeraCrypt is already installed.</li>
 <li>Update libzip to latest version 1.7.3.</li>
 <li>Update translations.</li>
 </ul>
diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt
index 1e9378f4..cf7e95c2 100644
--- a/src/Build/CMakeLists.txt
+++ b/src/Build/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 
 # - Set version of the package
 set( FULL_VERSION 		"1.24-Update7" )
-set( VERSION 			"1.24.22" )
+set( VERSION 			"1.24.23" )
 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 8dc3ca48..099bf033 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.24.22</string>
+	<string>1.24.23</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 05a5dc76..3362911a 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.24.22</string>
+	<string>1.24.23</string>
 
 	<key>CFBundleShortVersionString</key>
 	<string>_VERSION_</string>
diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h
index 623ffc6a..ac85b439 100644
--- a/src/Common/Tcdefs.h
+++ b/src/Common/Tcdefs.h
@@ -67,7 +67,7 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
 #define VERSION_NUM						0x0124
 
 // Release date
-#define TC_STR_RELEASE_DATE			L"August 5, 2020"
+#define TC_STR_RELEASE_DATE			L"August 6, 2020"
 #define TC_RELEASE_DATE_YEAR			2020
 #define TC_RELEASE_DATE_MONTH			 8
 
diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc
index 796eee11..0315ea37 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,24,22,0
- PRODUCTVERSION 1,24,22,0
+ FILEVERSION 1,24,23,0
+ PRODUCTVERSION 1,24,23,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/src/Format/Format.rc b/src/Format/Format.rc
index d5285cea..0e5cccec 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,24,22,0
- PRODUCTVERSION 1,24,22,0
+ FILEVERSION 1,24,23,0
+ PRODUCTVERSION 1,24,23,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc
index c81d5329..e5d102b9 100644
--- a/src/Mount/Mount.rc
+++ b/src/Mount/Mount.rc
@@ -559,8 +559,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,24,22,0
- PRODUCTVERSION 1,24,22,0
+ FILEVERSION 1,24,23,0
+ PRODUCTVERSION 1,24,23,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj
index bf76459f..f59973f0 100755
--- a/src/Setup/MacOSX/veracrypt.pkgproj
+++ b/src/Setup/MacOSX/veracrypt.pkgproj
@@ -555,7 +555,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.24.22</string>
+				<string>1.24.23</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
diff --git a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
index 0fd13831..4979d41f 100755
--- a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
+++ b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
@@ -555,7 +555,7 @@
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.24.22</string>
+				<string>1.24.23</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc
index 72f572ca..adbf8b7f 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,24,22,0
- PRODUCTVERSION 1,24,22,0
+ FILEVERSION 1,24,23,0
+ PRODUCTVERSION 1,24,23,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc
index 415b216c..91e05ef2 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,24,22,0
- PRODUCTVERSION 1,24,22,0
+ FILEVERSION 1,24,23,0
+ PRODUCTVERSION 1,24,23,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
-- 
cgit v1.2.3