6 files changed, 9 insertions, 9 deletions
diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt
index 51c8bdd2..24c37df9 100644
--- a/src/Build/CMakeLists.txt
+++ b/src/Build/CMakeLists.txt
@@ -1,50 +1,50 @@
 # - Minimum CMake version
 cmake_minimum_required(VERSION 2.8.0)
 
 # - Obligatory parameters
 #		-DVERACRYPT_BUILD_DIR 	: folder that contains 'usr' folder
 #		-DNOGUI					: TRUE if building 'Console' version, 'FALSE' if building 'GUI' version
 if ( NOT DEFINED VERACRYPT_BUILD_DIR )
 	MESSAGE(FATAL_ERROR "VERACRYPT_BUILD_DIR variable MUST BE set to the path of the folder which contains 'usr' folder")
 elseif ( NOT DEFINED NOGUI )
 	MESSAGE(FATAL_ERROR "NOGUI variable MUST BE set to TRUE if building 'Console' version, 'FALSE' otherwise")
 endif()
 
 # - Set version of the package
-set( FULL_VERSION 		"1.25.9" )
-set( VERSION 			"1.25.9" )
+set( FULL_VERSION 		"1.26.0" )
+set( VERSION 			"1.26.0" )
 set( RELEASE 			"1" )
 
 # - Set PROJECT_NAME and CONFLICT_PACKAGE values
 if (NOGUI)
 	set( PROJECT_NAME 		"veracrypt-console" )
 	set( CONFLICT_PACKAGE	"veracrypt" )
 else()
 	set( PROJECT_NAME 		"veracrypt" )
 	set( CONFLICT_PACKAGE	"veracrypt-console" )
 endif()
 project(${PROJECT_NAME})
 
 # - Check whether 'Tcdefs.h' and 'License.txt' exist
 if(NOT EXISTS "$ENV{SOURCEPATH}/Common/Tcdefs.h")
 	MESSAGE(FATAL_ERROR "Tcdefs.h does not exist.")
 elseif(NOT EXISTS "$ENV{SOURCEPATH}/License.txt")
 	MESSAGE(FATAL_ERROR "License.txt does not exist.")
 endif()
 
 # - Detect build system bitness
 #	The following variable will be set
 #		$SUFFIX					32			64
 #		$CMAKE_SYSTEM_NAME		Windows		Linux	Darwin
 # 	N.B : 
 #		To build for 32-bit under 64-bit, set 'CMAKE_SIZEOF_VOID_P' to '4'
 if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
 
 	#	Build System is under 64-bit arch
 	set (SUFFIX "64")
 	MESSAGE(STATUS "Build System = ${CMAKE_SYSTEM_NAME} - Bitness : 64-bit - Compiler : ${CMAKE_CXX_COMPILER_ID}")
 	
 elseif( CMAKE_SIZEOF_VOID_P EQUAL 4 )
 
 	#	Build System is under 32-bit arch
 	set (SUFFIX "32")
diff --git a/src/Build/Resources/MacOSX/Info.plist.legacy.xml b/src/Build/Resources/MacOSX/Info.plist.legacy.xml
index d21c1cf5..ffe0ed69 100644
--- a/src/Build/Resources/MacOSX/Info.plist.legacy.xml
+++ b/src/Build/Resources/MacOSX/Info.plist.legacy.xml
@@ -42,65 +42,65 @@
      	   <key>CFBundleTypeIconFile</key>
      	   <string>VeraCrypt_Volume.icns</string>
     	    <key>CFBundleTypeName</key>
         	<string>VeraCrypt Container File</string>
 	        <key>CFBundleTypeRole</key>
     	    <string>Viewer</string>
         	<key>LSHandlerRank</key>
         	<string>Owner</string>
         	<key>LSItemContentTypes</key>
         	<array>
             	<!-- my app supports files with my custom extension (see UTExportedTypeDeclarations) -->
             	<string>org.idrix.veracrypt.hc</string>
         	</array>
     	</dict>
 	</array>
 
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 
 	<key>CFBundleExecutable</key>
 	<string>VeraCrypt</string>
 
 	<key>CFBundleIconFile</key>
 	<string>VeraCrypt.icns</string>
 
 	<key>CFBundleName</key>
 	<string>VeraCrypt</string>
 
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 
 	<key>CFBundleSignature</key>
 	<string>TRUE</string>
 
 	<key>CFBundleVersion</key>
-	<string>1.25.9</string>
+	<string>1.26.0</string>
 
 	<key>CFBundleShortVersionString</key>
 	<string>_VERSION_</string>
 
 	<key>CFBundleLongVersionString</key>
 	<string>VeraCrypt _VERSION_</string>
 
 	<key>LSArchitecturePriority</key>
 	<array>
 		<string>x86_64</string>
 		<string>i386</string>
 	</array>
 
 	<key>LSMinimumSystemVersion</key>
 	<string>10.7.0</string>
 
 	<key>LSRequiresCarbon</key>
 	<false/>
 
 	<key>CSResourcesFileMapped</key>
 	<true/>
 
     <key>NSHighResolutionCapable</key>
     <true/>
 
     <key>NSPrincipalClass</key>
     <string>NSApplication</string>
 </dict>
 </plist>
diff --git a/src/Build/Resources/MacOSX/Info.plist.xml b/src/Build/Resources/MacOSX/Info.plist.xml
index 6af60edd..d4729eff 100644
--- a/src/Build/Resources/MacOSX/Info.plist.xml
+++ b/src/Build/Resources/MacOSX/Info.plist.xml
@@ -42,59 +42,59 @@
      	   <key>CFBundleTypeIconFile</key>
      	   <string>VeraCrypt_Volume.icns</string>
     	    <key>CFBundleTypeName</key>
         	<string>VeraCrypt Container File</string>
 	        <key>CFBundleTypeRole</key>
     	    <string>Viewer</string>
         	<key>LSHandlerRank</key>
         	<string>Owner</string>
         	<key>LSItemContentTypes</key>
         	<array>
             	<!-- my app supports files with my custom extension (see UTExportedTypeDeclarations) -->
             	<string>org.idrix.veracrypt.hc</string>
         	</array>
     	</dict>
 	</array>
 
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 
 	<key>CFBundleExecutable</key>
 	<string>VeraCrypt</string>
 
 	<key>CFBundleIconFile</key>
 	<string>VeraCrypt.icns</string>
 
 	<key>CFBundleName</key>
 	<string>VeraCrypt</string>
 
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 
 	<key>CFBundleSignature</key>
 	<string>TRUE</string>
 
 	<key>CFBundleVersion</key>
-	<string>1.25.9</string>
+	<string>1.26.0</string>
 
 	<key>CFBundleShortVersionString</key>
 	<string>_VERSION_</string>
 
 	<key>CFBundleLongVersionString</key>
 	<string>VeraCrypt _VERSION_</string>
 
 	<key>LSMinimumSystemVersion</key>
 	<string>10.9.0</string>
 
 	<key>LSRequiresCarbon</key>
 	<false/>
 
 	<key>CSResourcesFileMapped</key>
 	<true/>
 
     <key>NSHighResolutionCapable</key>
     <true/>
 
     <key>NSPrincipalClass</key>
     <string>NSApplication</string>
 </dict>
 </plist>
diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h
index f2ffb02b..eb8fefdc 100644
--- a/src/Common/Tcdefs.h
+++ b/src/Common/Tcdefs.h
@@ -41,71 +41,71 @@ extern "C" {
 extern unsigned __int64 __cdecl _rotl64(unsigned __int64,int);
 extern unsigned __int64 __cdecl _rotr64(unsigned __int64,int);
 extern unsigned int __cdecl _rotl(unsigned int,int);
 extern unsigned int __cdecl _rotr(unsigned int,int);
 extern unsigned char _rotr8(unsigned char value, unsigned char shift);
 extern unsigned short _rotr16(unsigned short value, unsigned char shift);
 extern unsigned char _rotl8(unsigned char value, unsigned char shift);
 extern unsigned short _rotl16(unsigned short value, unsigned char shift);
 #ifdef  __cplusplus
 }
 #endif
 
 #endif // defined(_UEFI)
 
 #ifdef TC_WINDOWS_BOOT
 #include <stddef.h>
 #endif
 
 #define TC_APP_NAME						"VeraCrypt"
 
 // Version displayed to user 
 #define VERSION_STRING					"1.26"
 
 #ifdef VC_EFI_CUSTOM_MODE
 #define VERSION_STRING_SUFFIX			"-CustomEFI"
 #elif defined(VC_SKIP_OS_DRIVER_REQ_CHECK)
 #define VERSION_STRING_SUFFIX			"-TESTSIGNING"
 #else
 #define VERSION_STRING_SUFFIX			""
 #endif
 
 // Version number to compare against driver
 #define VERSION_NUM						0x0126
 
 // Release date
-#define TC_STR_RELEASE_DATE			L"March 9, 2022"
+#define TC_STR_RELEASE_DATE			L"March 21, 2022"
 #define TC_RELEASE_DATE_YEAR			2022
 #define TC_RELEASE_DATE_MONTH			 03
 
 #define BYTES_PER_KB                    1024LL
 #define BYTES_PER_MB                    1048576LL
 #define BYTES_PER_GB                    1073741824LL
 #define BYTES_PER_TB                    1099511627776LL
 #define BYTES_PER_PB                    1125899906842624LL
 
 /* GUI/driver errors */
 
 #define WIDE(x) (LPWSTR)L##x
 
 #define VC_MAX(a,b)	((a)>(b))?(a):(b)
 #define VC_MIN(a,b)	((a)<(b))?(a):(b)
 
 #ifdef _MSC_VER
 
 typedef __int8 int8;
 typedef __int16 int16;
 typedef __int32 int32;
 typedef unsigned __int8 byte;
 typedef unsigned __int8 uint8;
 typedef unsigned __int16 uint16;
 typedef unsigned __int32 uint32;
 
 #ifdef TC_NO_COMPILER_INT64
 typedef unsigned __int32	TC_LARGEST_COMPILER_UINT;
 #else
 typedef unsigned __int64	TC_LARGEST_COMPILER_UINT;
 typedef __int64 int64;
 typedef unsigned __int64 uint64;
 #define LL(x) x##ui64
 #endif
 
diff --git a/src/Setup/MacOSX/veracrypt.pkgproj b/src/Setup/MacOSX/veracrypt.pkgproj
index 8a365677..975b90a1 100755
--- a/src/Setup/MacOSX/veracrypt.pkgproj
+++ b/src/Setup/MacOSX/veracrypt.pkgproj
@@ -526,71 +526,71 @@
 					<integer>1</integer>
 				</dict>
 				<key>PREINSTALL_PATH</key>
 				<dict>
 					<key>PATH_TYPE</key>
 					<integer>0</integer>
 				</dict>
 				<key>RESOURCES</key>
 				<array/>
 			</dict>
 			<key>PACKAGE_SETTINGS</key>
 			<dict>
 				<key>AUTHENTICATION</key>
 				<integer>1</integer>
 				<key>CONCLUSION_ACTION</key>
 				<integer>0</integer>
 				<key>FOLLOW_SYMBOLIC_LINKS</key>
 				<false/>
 				<key>IDENTIFIER</key>
 				<string>com.idrix.pkg.veracrypt</string>
 				<key>LOCATION</key>
 				<integer>0</integer>
 				<key>NAME</key>
 				<string>veracrypt</string>
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>PAYLOAD_SIZE</key>
 				<integer>-1</integer>
 				<key>REFERENCE_PATH</key>
 				<string></string>
 				<key>RELOCATABLE</key>
 				<false/>
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.25.9</string>
+				<string>1.26.0</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
 			<key>UUID</key>
 			<string>B14381D9-EC5F-43E4-B971-82AB3D132A64</string>
 		</dict>
 	</array>
 	<key>PROJECT</key>
 	<dict>
 		<key>PROJECT_COMMENTS</key>
 		<dict>
 			<key>NOTES</key>
 			<data>
 			PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1M
 			IDQuMDEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQv
 			c3RyaWN0LmR0ZCI+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1l
 			cXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7
 			IGNoYXJzZXQ9VVRGLTgiPgo8bWV0YSBodHRwLWVxdWl2PSJDb250
 			ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp
 			dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u
 			dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD
 			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjExMzguNTEiPgo8c3R5bGUg
 			dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5
 			Pgo8L2JvZHk+CjwvaHRtbD4K
 			</data>
 		</dict>
 		<key>PROJECT_PRESENTATION</key>
 		<dict>
 			<key>BACKGROUND</key>
 			<dict>
 				<key>APPAREANCES</key>
 				<dict>
 					<key>DARK_AQUA</key>
 					<dict/>
 					<key>LIGHT_AQUA</key>
@@ -994,53 +994,53 @@ https://osxfuse.github.io/
 					<true/>
 					<key>PROXY_NAME</key>
 					<string>Optimize nib files</string>
 					<key>PROXY_TOOLTIP</key>
 					<string>Remove "classes.nib", "info.nib" and "designable.nib" files within .nib bundles.</string>
 					<key>STATE</key>
 					<true/>
 				</dict>
 				<dict>
 					<key>PATTERNS_ARRAY</key>
 					<array>
 						<dict>
 							<key>REGULAR_EXPRESSION</key>
 							<false/>
 							<key>STRING</key>
 							<string>Resources Disabled</string>
 							<key>TYPE</key>
 							<integer>1</integer>
 						</dict>
 					</array>
 					<key>PROTECTED</key>
 					<true/>
 					<key>PROXY_NAME</key>
 					<string>Remove Resources Disabled folders</string>
 					<key>PROXY_TOOLTIP</key>
 					<string>Remove "Resources Disabled" folders.</string>
 					<key>STATE</key>
 					<true/>
 				</dict>
 				<dict>
 					<key>SEPARATOR</key>
 					<true/>
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>VeraCrypt 1.25.9</string>
+			<string>VeraCrypt 1.26</string>
 			<key>PAYLOAD_ONLY</key>
 			<false/>
 			<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>
 			<false/>
 		</dict>
 	</dict>
 	<key>SHARED_GLOBAL_DATA</key>
 	<dict>
 		<key>IC_REQUIREMENT_JAVASCRIPT_SHARED_SOURCE_CODE</key>
 		<string></string>
 	</dict>
 	<key>TYPE</key>
 	<integer>0</integer>
 	<key>VERSION</key>
 	<integer>2</integer>
 </dict>
 </plist>
diff --git a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
index 3e6e2653..75a879a3 100755
--- a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
+++ b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj
@@ -525,71 +525,71 @@
 					<integer>1</integer>
 				</dict>
 				<key>PREINSTALL_PATH</key>
 				<dict>
 					<key>PATH_TYPE</key>
 					<integer>0</integer>
 				</dict>
 				<key>RESOURCES</key>
 				<array/>
 			</dict>
 			<key>PACKAGE_SETTINGS</key>
 			<dict>
 				<key>AUTHENTICATION</key>
 				<integer>1</integer>
 				<key>CONCLUSION_ACTION</key>
 				<integer>0</integer>
 				<key>FOLLOW_SYMBOLIC_LINKS</key>
 				<false/>
 				<key>IDENTIFIER</key>
 				<string>com.idrix.pkg.veracrypt</string>
 				<key>LOCATION</key>
 				<integer>0</integer>
 				<key>NAME</key>
 				<string>veracrypt</string>
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>PAYLOAD_SIZE</key>
 				<integer>-1</integer>
 				<key>REFERENCE_PATH</key>
 				<string></string>
 				<key>RELOCATABLE</key>
 				<false/>
 				<key>USE_HFS+_COMPRESSION</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.25.9</string>
+				<string>1.26.0</string>
 			</dict>
 			<key>TYPE</key>
 			<integer>0</integer>
 			<key>UUID</key>
 			<string>B14381D9-EC5F-43E4-B971-82AB3D132A64</string>
 		</dict>
 	</array>
 	<key>PROJECT</key>
 	<dict>
 		<key>PROJECT_COMMENTS</key>
 		<dict>
 			<key>NOTES</key>
 			<data>
 			PCFET0NUWVBFIGh0bWwgUFVCTElDICItLy9XM0MvL0RURCBIVE1M
 			IDQuMDEvL0VOIiAiaHR0cDovL3d3dy53My5vcmcvVFIvaHRtbDQv
 			c3RyaWN0LmR0ZCI+CjxodG1sPgo8aGVhZD4KPG1ldGEgaHR0cC1l
 			cXVpdj0iQ29udGVudC1UeXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7
 			IGNoYXJzZXQ9VVRGLTgiPgo8bWV0YSBodHRwLWVxdWl2PSJDb250
 			ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp
 			dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u
 			dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD
 			b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjExMzguNTEiPgo8c3R5bGUg
 			dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5
 			Pgo8L2JvZHk+CjwvaHRtbD4K
 			</data>
 		</dict>
 		<key>PROJECT_PRESENTATION</key>
 		<dict>
 			<key>BACKGROUND</key>
 			<dict>
 				<key>APPAREANCES</key>
 				<dict>
 					<key>DARK_AQUA</key>
 					<dict/>
 					<key>LIGHT_AQUA</key>
@@ -1030,53 +1030,53 @@ https://osxfuse.github.io/
 					<true/>
 					<key>PROXY_NAME</key>
 					<string>Optimize nib files</string>
 					<key>PROXY_TOOLTIP</key>
 					<string>Remove "classes.nib", "info.nib" and "designable.nib" files within .nib bundles.</string>
 					<key>STATE</key>
 					<true/>
 				</dict>
 				<dict>
 					<key>PATTERNS_ARRAY</key>
 					<array>
 						<dict>
 							<key>REGULAR_EXPRESSION</key>
 							<false/>
 							<key>STRING</key>
 							<string>Resources Disabled</string>
 							<key>TYPE</key>
 							<integer>1</integer>
 						</dict>
 					</array>
 					<key>PROTECTED</key>
 					<true/>
 					<key>PROXY_NAME</key>
 					<string>Remove Resources Disabled folders</string>
 					<key>PROXY_TOOLTIP</key>
 					<string>Remove "Resources Disabled" folders.</string>
 					<key>STATE</key>
 					<true/>
 				</dict>
 				<dict>
 					<key>SEPARATOR</key>
 					<true/>
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>VeraCrypt Legacy 1.25.9</string>
+			<string>VeraCrypt Legacy 1.26</string>
 			<key>PAYLOAD_ONLY</key>
 			<false/>
 			<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>
 			<false/>
 		</dict>
 	</dict>
 	<key>SHARED_GLOBAL_DATA</key>
 	<dict>
 		<key>IC_REQUIREMENT_JAVASCRIPT_SHARED_SOURCE_CODE</key>
 		<string></string>
 	</dict>
 	<key>TYPE</key>
 	<integer>0</integer>
 	<key>VERSION</key>
 	<integer>2</integer>
 </dict>
 </plist>