Windows: Load Riched20.dll to use RichEdit control. Use InitCommonControlsEx instead of InitCommonControls

This can be useful for users who need Accessibility software that may not work when memory protection is active in VeraCrypt

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: "https://www.veracrypt.fr/en/Donation.html"

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,34 @@
+---
+name: Bug Report
+about: Found a bug? Let us know! 🐛
+labels: bug, unreviewed
+
+---
+
+<!-- Please provide a general summary of the issue in the title above. -->
+
+# Expected behavior
+<!-- Describe here what you have expected to happen -->
+
+# Observed behavior
+<!-- Describe here what happened instead of the expected behavior -->
+
+# Steps to reproduce
+<!-- Tell use all the steps you did so we can reproduce the problem -->
+1. 
+2. 
+3. 
+4.
+
+# Screenshots
+<!-- Add additional screenshots -->
+
+# Your Environment
+
+Please tell us more about your environment
+
+**VeraCrypt version:** <!-- f.e. 1.24-Update7 -->
+
+**Operating system and version:** <!-- f.e. Windows 10 build 19042 -->
+
+**System type:** <!-- f.e. 64-bit -->

.github/ISSUE_TEMPLATE/change.md

@@ -0,0 +1,30 @@
+---
+name: Change
+about: Change or extend functionality that already exists.
+labels: change, unreviewed
+
+---
+
+<!-- Please provide a general summary of your change in the title above. -->
+
+# Current behavior
+<!-- Describe here how it actually works -->
+
+# Desired behavior
+<!-- Describe here the difference from current behavior-->
+
+# Screenshots/Mockup/Designs
+<!-- Add additional screenshots, mockups or design proposals -->
+
+# Additional information
+<!-- Are there any additional requirements? Further ideas, ... -->
+
+# Your Environment
+
+Please tell us more about your environment
+
+**VeraCrypt version:** <!-- f.e. 1.24-Update7 -->
+
+**Operating system and version:** <!-- f.e. Windows 10 build 19042 -->
+
+**System type:** <!-- f.e. 64-bit -->

.github/ISSUE_TEMPLATE/feature.md

@@ -0,0 +1,27 @@
+---
+name: Feature
+about: Add new functionality or suggest an idea to the project.
+labels: feature, unreviewed
+
+---
+
+<!-- Please provide a general summary of your feature in the title above. -->
+
+# Desired behavior
+<!-- Describe here what and why your feature should be added -->
+
+# Screenshots/Mockup/Designs
+<!-- Add additional screenshots, mockups or design proposals -->
+
+# Additional information
+<!-- Are there any additional requirements? Further ideas, ... -->
+
+# Your Environment
+
+Please tell us more about your environment
+
+**VeraCrypt version:** <!-- f.e. 1.24-Update7 -->
+
+**Operating system and version:** <!-- f.e. Windows 10 build 19042 -->
+
+**System type:** <!-- f.e. 64-bit -->

.github/stale.yml

@@ -0,0 +1,25 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 60
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 7
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: >
+  This issue has been automatically closed because it has not had
+  recent activity. This probably means that it is not reproducible
+  or it has been fixed in a newer version. If it’s an enhancement
+  and hasn't been taken on for so long, then it seems no one has
+  the time to implement this.
+  Please reopen if you still encounter this issue with the [latest stable version](https://www.veracrypt.fr/en/Downloads.html).
+  You can also contribute directly by providing a pull request.
+  Thank you!

.gitignore

@@ -0,0 +1,110 @@
+# For those using Visual Studio Code for development
+.vscode/
+
+# CLion
+.idea/
+
+# VC Linux build artifacts
+*.o
+*.o0
+*.d
+*.a
+*.bmp.h
+*.xml.h
+*.txt.h
+*.h.gch
+src/Main/veracrypt
+*.osse41
+*.ossse3
+
+# VC macOS build artifacts
+src/Main/VeraCrypt
+src/Main/VeraCrypt.app
+src/Main/*.dmg
+src/Setup/MacOSX/*.pkg
+*.oo
+*.o.32
+*.o.64
+.DS_Store
+
+# wxWidgets Linux build artifacts
+src/wxrelease
+src/wxdebug
+
+src/.vs
+
+src/Boot/Windows/obj
+src/Boot/Windows/Release
+src/Boot/Windows/Release_AES
+src/Boot/Windows/Release_AES_SHA2
+src/Boot/Windows/Release_Camellia
+src/Boot/Windows/Release_Camellia_SHA2
+src/Boot/Windows/Release_Serpent
+src/Boot/Windows/Release_Serpent_SHA2
+src/Boot/Windows/Release_SHA2
+src/Boot/Windows/Release_Twofish
+src/Boot/Windows/Release_Twofish_SHA2
+src/Boot/Windows/Rescue
+src/Boot/Windows/Rescue_AES
+src/Boot/Windows/Rescue_AES_SHA2
+src/Boot/Windows/Rescue_Camellia
+src/Boot/Windows/Rescue_Camellia_SHA2
+src/Boot/Windows/Rescue_Serpent
+src/Boot/Windows/Rescue_Serpent_SHA2
+src/Boot/Windows/Rescue_SHA2
+src/Boot/Windows/Rescue_Twofish
+src/Boot/Windows/Rescue_Twofish_SHA2
+
+src/Common/Debug
+src/Common/obj_driver_debug
+src/Common/obj_driver_release
+src/Common/Release
+src/Common/x64
+src/Common/ARM64
+src/Common/*.log
+
+src/Crypto/Debug
+src/Crypto/obj_driver_debug
+src/Crypto/obj_driver_release
+src/Crypto/Release
+src/Crypto/x64
+src/Crypto/ARM64
+
+src/Debug
+
+src/Driver/Debug
+src/Driver/obj
+src/Driver/obj_driver_debug
+src/Driver/obj_driver_release
+src/Driver/Release
+src/Driver/ARM64
+
+src/ExpandVolume/Debug
+src/ExpandVolume/Release
+src/ExpandVolume/x64
+src/ExpandVolume/ARM64
+src/ExpandVolume/*.tlb
+
+src/Format/Debug
+src/Format/Release
+src/Format/x64
+src/Format/ARM64
+src/Format/*.tlb
+src/Format/FormatCom_h.h
+src/Format/FormatCom_i.c
+
+src/Mount/Debug
+src/Mount/Release
+src/Mount/x64
+src/Mount/ARM64
+src/Mount/*.tlb
+src/Mount/MainCom_h.h
+src/Mount/MainCom_i.c
+
+src/Setup/Debug
+src/Setup/PortableDebug
+src/Setup/Release
+src/Setup/PortableRelease
+
+src/SetupDLL/Debug
+src/SetupDLL/Release

License.txt

@@ -700,7 +700,7 @@ Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
   Jean-loup Gailly        Mark Adler
   jloup@gzip.org          madler@alumni.caltech.edu
 ____________________________________________________________
-Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner
+Copyright (C) 1999-2017 Dieter Baron and Thomas Klausner
 
 The authors can be contacted at <libzip@nih.at>
 
@@ -742,3 +742,68 @@ version 3.0 (LGPL-3.0).
 
 The full text of the license may be found at https://opensource.org/licenses/LGPL-3.0
 ____________________________________________________________
+Copyright (c) 1999-2016 Jack Lloyd. 
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in
+  the documentation and/or other materials provided with the
+  distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS
+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+____________________________________________________________
+Copyright (c) 2013-2018 Stephan Mueller <smueller@chronox.de>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, and the entire permission notice in its entirety, 
+   including the disclaimer of warranties.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. The name of the author may not be used to endorse or promote
+   products derived from this software without specific prior
+   written permission.
+
+ALTERNATIVELY, this product may be distributed under the terms of
+the GNU General Public License, in which case the provisions of the
+GPL2 are required INSTEAD OF the above restrictions. (This clause is
+necessary due to a potential bad interaction between the GPL and the
+restrictions contained in a BSD-style copyright.)
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF WHICH
+ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+____________________________________________________________

README.md

@@ -17,23 +17,17 @@ called 'TrueCrypt' or 'VeraCrypt'
 Contents
 ========
 
-I. Windows
+[I. Windows](#i-windows)
-   Requirements for Building VeraCrypt for Windows.
-   Instructions for Building VeraCrypt for Windows.
-	Instructions for Signing and Packaging VeraCrypt for Windows.
 
-II. Linux and Mac OS X
+[II. Linux and Mac OS X](#ii-linux-and-mac-os-x)
-    Requirements for Building VeraCrypt for Linux and Mac OS X.
-    Instructions for Building VeraCrypt for Linux and Mac OS X.
-	Mac OS X specifics
 
-III. FreeBSD and OpenSolaris
+[III. FreeBSD](#iii-freebsd) 
 
-IV. Third-Party Developers (Contributors)
+[IV. Third-Party Developers (Contributors)](#iv-third-party-developers-contributors) 
 
-V. Legal Information
+[V. Legal Information](#v-legal-information) 
 
-VI. Further Information
+[VI. Further Information](#vi-further-information) 
 
 
 
@@ -43,15 +37,9 @@ I. Windows
 Requirements for Building VeraCrypt for Windows:
 ------------------------------------------------
 
-- Microsoft Visual C++ 2010 SP1 (Professional Edition or compatible)
+A detailed guide on how to build VeraCrypt on Windows can be found in 
-- Microsoft Visual C++ 1.52 (available from MSDN Subscriber Downloads)
+the file doc/html/CompilingGuidelineWin.html. it is also available online
-- Microsoft Windows SDK for Windows 7.1 (configured for Visual C++ 2010)
+at https://www.veracrypt.fr/en/CompilingGuidelineWin.html
-- Microsoft Windows SDK for Windows 8.1 (needed for SHA-256 code signing)
-- Microsoft Windows Driver Kit 7.1.0 (build 7600.16385.1)
-- NASM assembler 2.08 or compatible
-- YASM 1.3.0 or newer.
-- gzip compressor
-- upx packer (available at https://upx.github.io/)
 
 IMPORTANT:
 
@@ -59,44 +47,19 @@ The 64-bit editions of Windows Vista and later versions of Windows, and in
 some cases (e.g. playback of HD DVD content) also the 32-bit editions, do not
 allow the VeraCrypt driver to run without an appropriate digital signature.
 Therefore, all .sys files in official VeraCrypt binary packages are digitally
-signed with the digital certificate of the IDRIX, which was
+signed with the digital certificate of the IDRIX, which was issued by 
-issued by Thawte certification authority. At the end of each official .exe and
+GlobalSign certification authority. At the end of each official .exe and
 .sys file, there are embedded digital signatures and all related certificates
 (i.e. all certificates in the relevant certification chain, such as the
 certification authority certificates, CA-MS cross-certificate, and the
 IDRIX certificate).
-Keep this in mind if you compile VeraCrypt
+Keep this in mind if you compile VeraCrypt and compare your binaries with the
-and compare your binaries with the official binaries. If your binaries are
+official binaries. If your binaries are unsigned, the sizes of the official
-unsigned, the sizes of the official binaries will usually be approximately
+binaries will usually be approximately 10 KiB greater than sizes of your 
-10 KB greater than sizes of your binaries (there may be further differences
+binaries (there may be further differences if you use a different version of
-if you use a different version of the compiler, or if you install a different
+the compiler, or if you install a different or no service pack for Visual
-or no service pack for Visual Studio, or different hotfixes for it, or if you
+Studio, or different hotfixes for it, or if you use different versions of
-use different versions of the required SDKs).
+the required SDKs).
-
-
-Instructions for Building VeraCrypt for Windows:
-------------------------------------------------
-
-1) Create an environment variable 'MSVC16_ROOT' pointing to the folder 'MSVC15'
-   extracted from the Visual C++ 1.52 self-extracting package.
-
-   Note: The 16-bit installer MSVC15\SETUP.EXE cannot be run on 64-bit Windows,
-   but it is actually not necessary to run it. You only need to extract the
-   folder 'MSVC15', which contains the 32-bit binaries required to build the
-   VeraCrypt Boot Loader.
-
-2) If you have installed the Windows Driver Development Kit in another
-   directory than '%SYSTEMDRIVE%\WinDDK', create an environment variable
-   'WINDDK_ROOT' pointing to the DDK installation directory.
-
-3) Open the solution file 'VeraCrypt.sln' in Microsoft Visual Studio 2010.
-
-4) Select 'All' as the active solution configuration.
-
-5) Build the solution.
-
-6) If successful, there should be newly built VeraCrypt binaries in the
-   'Release' folder.
 
 Instructions for Signing and Packaging VeraCrypt for Windows:
 -------------------------------------------------------------
@@ -105,11 +68,13 @@ First, create an environment variable 'WSDK81' pointing to the Windows SDK
 for Windows 8.1 installation directory.
 The folder "Signing" contains a batch file (sign.bat) that will sign all
 VeraCrypt components using a code signing certificate present on the
-certificate store and also build the final installation setup.
+certificate store and also build the final installation setup and MSI package.
-The batch file suppose that the code signing certificate is issued by Thawt.
+The batch file suppose that the code signing certificate is issued by
-This is the case for IDRIX's certificate. If yours is issued by another CA,
+GlobalSign. This is the case for IDRIX's certificate. If yours is issued by
-then you should put the Root and Intermediate certificates in the "Signing"
+another CA, then you should put its intermediate certificates in the "Signing"
-folder and then modify sign.bat accordingly.
+folder and modify sign.bat accordingly.
+
+In order to generate MSI packages, WiX Toolset v3.11 must be installed.
 
 VeraCrypt EFI Boot Loader:
 --------------------------
@@ -123,6 +88,10 @@ For build instructions, please refer to the file src\Boot\EFI\Readme.txt.
 II. Linux and Mac OS X
 ======================
 
+A detailed guide on how to build VeraCrypt on Linux can be found in 
+the file doc/html/CompilingGuidelineLinux.html. it is also available online
+at https://www.veracrypt.fr/en/CompilingGuidelineLinux.html
+
 Requirements for Building VeraCrypt for Linux and Mac OS X:
 -----------------------------------------------------------
 
@@ -135,6 +104,7 @@ Requirements for Building VeraCrypt for Linux and Mac OS X:
   wxWidgets 3.0 library source code (available at https://www.wxwidgets.org)
 - FUSE library and header files (available at https://github.com/libfuse/libfuse
   and https://osxfuse.github.io/)
+- PCSC-lite library and header files (available at https://github.com/LudovicRousseau/PCSC)
 
 
 Instructions for Building VeraCrypt for Linux and Mac OS X:
@@ -146,7 +116,7 @@ Instructions for Building VeraCrypt for Linux and Mac OS X:
    command to configure the wxWidgets static library for VeraCrypt and to
    build it:
 
-   $ make WXSTATIC=1 WX_ROOT=/usr/src/wxWidgets wxbuild
+       $ make WXSTATIC=1 WX_ROOT=/usr/src/wxWidgets wxbuild
 
    The variable WX_ROOT must point to the location of the source code of the
    wxWidgets library. Output files will be placed in the './wxrelease/'
@@ -154,11 +124,11 @@ Instructions for Building VeraCrypt for Linux and Mac OS X:
 
 3) To build VeraCrypt, run the following command:
 
-   $ make
+       $ make
 
    or if you have no wxWidgets shared library installed:
 
-   $ make WXSTATIC=1
+       $ make WXSTATIC=1
 
 4) If successful, the VeraCrypt executable should be located in the directory
    'Main'.
@@ -168,18 +138,18 @@ interface (through the switch --text) is built.
 On Linux, a console-only executable, which requires no GUI library, can be
 built using the 'NOGUI' parameter:
 
-   $ make NOGUI=1 WXSTATIC=1 WX_ROOT=/usr/src/wxWidgets wxbuild
+    $ make NOGUI=1 WXSTATIC=1 WX_ROOT=/usr/src/wxWidgets wxbuild
-   $ make NOGUI=1 WXSTATIC=1
+    $ make NOGUI=1 WXSTATIC=1
 
 On MacOSX, building a console-only executable is not supported.
 
 Mac OS X specifics:
 -----------------------------------------------------------
 
-Under MacOSX, the SDK for OSX 10.7 is used by default. To use another version
+Under MacOSX, the SDK for OSX 11.3 is used by default. To use another version
-of the SDK (i.e. 10.6), you can export the environment variable VC_OSX_TARGET:
+of the SDK (i.e. 10.15), you can export the environment variable VC_OSX_TARGET:
 
-	$ export VC_OSX_TARGET=10.6
+	$ export VC_OSX_TARGET=10.15
 
 
 Before building under MacOSX, pkg-config must be installed if not yet available.
@@ -191,13 +161,13 @@ compile using the following commands :
 	$ sudo make install
 
 After making sure pkg-config is available, download and install OSXFuse from
-https://osxfuse.github.io/ (MacFUSE compatibility layer must selected)
+https://osxfuse.github.io/
 
 The script build_veracrypt_macosx.sh available under "src/Build" performs the
 full build of VeraCrypt including the creation of the installer pkg. It expects
-to find the wxWidgets 3.0.3 sources at the same level as where you put
+to find the wxWidgets 3.1.2 sources at the same level as where you put
 VeraCrypt sources (i.e. if "src" path is "/Users/joe/Projects/VeraCrypt/src"
-then wxWidgets should be at "/Users/joe/Projects/wxWidgets-3.0.3")
+then wxWidgets should be at "/Users/joe/Projects/wxWidgets-3.1.2")
 
 The build process uses Code Signing certificates whose ID is specified in
 src/Main/Main.make (look for lines containing "Developer ID Application" and
@@ -210,10 +180,12 @@ Thus, we recommend using a different OSX SDK version for building VeraCrypt.
 
 
 
-III. FreeBSD and OpenSolaris
+III. FreeBSD
 ============================
 
-FreeBSD and OpenSolaris are not yet supported.
+FreeBSD is supported starting from version 11.
+The build requirements and instructions are the same as Linux except that gmake
+should be used instead of make.
 
 
 
@@ -239,18 +211,20 @@ Copyright Information
 ---------------------
 
 This software as a whole:  
-Copyright (c) 2013-2017 IDRIX. All rights reserved.
+Copyright (c) 2013-2023 IDRIX. All rights reserved.
 
 Portions of this software:  
-Copyright (c) 2013-2017 IDRIX. All rights reserved.
+Copyright (c) 2013-2023 IDRIX. All rights reserved.  
 Copyright (c) 2003-2012 TrueCrypt Developers Association. All rights reserved.  
 Copyright (c) 1998-2000 Paul Le Roux. All rights reserved.  
 Copyright (c) 1998-2008 Brian Gladman, Worcester, UK. All rights reserved.  
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler.
+Copyright (c) 1995-2023 Jean-loup Gailly and Mark Adler.  
 Copyright (c) 2016 Disk Cryptography Services for EFI (DCS), Alex Kolotnikov  
-Copyright (c) Dieter Baron and Thomas Klausner.
+Copyright (c) 1999-2020 Dieter Baron and Thomas Klausner.  
 Copyright (c) 2013, Alexey Degtyarev. All rights reserved.  
-Copyright (c) 1999-2013,2014,2015,2016 Jack Lloyd. All rights reserved.
+Copyright (c) 1999-2016 Jack Lloyd. All rights reserved.  
+Copyright (c) 2013-2019 Stephan Mueller <smueller@chronox.de>  
+Copyright (c) 1999-2021 Igor Pavlov  
 
 For more information, please see the legal notices attached to parts of the
 source code.

contrib/EncryptData.ps1

@@ -0,0 +1,250 @@
+<#
+.SYNOPSIS
+This PowerShell script is used to create a VeraCrypt container with minimal size to hold a copy of the given input file or directory.
+
+.DESCRIPTION
+This script takes as input a file path or directory path and a container path.
+If the container path is not specified, it defaults to the same as the input path with a ".hc" extension.
+The script calculates the minimal size needed to hold the input file or directory in a VeraCrypt container.
+It then creates a VeraCrypt container with the specified path and the calculated size using exFAT filesystem.
+Finally, the container is mounted, the input file or directory is copied to the container and the container is dismounted.
+
+.PARAMETER inputPath
+The file path or directory path to be encrypted in the VeraCrypt container.
+
+.PARAMETER containerPath
+The desired path for the VeraCrypt container. If not specified, it defaults to the same as the input path with a ".hc" extension.
+
+.EXAMPLE
+.\EncryptData.ps1 -inputPath "C:\MyFolder" -containerPath "D:\MyContainer.hc"
+.\EncryptData.ps1 "C:\MyFolder" "D:\MyContainer.hc"
+.\EncryptData.ps1 "C:\MyFolder"
+
+.NOTES
+Author: Mounir IDRASSI
+Email: mounir.idrassi@idrix.fr
+Date: July 2023
+License: This script is licensed under the Apache License 2.0
+#>
+
+# parameters
+param(
+    [Parameter(Mandatory=$true)]
+    [string]$inputPath,
+    [string]$containerPath
+)
+function ConvertTo-AbsolutePath {
+    param (
+        [Parameter(Mandatory=$true)]
+        [string]$Path
+    )
+
+    if ([System.IO.Path]::IsPathRooted($Path)) {
+        return $Path
+    }
+    
+    return Join-Path -Path (Get-Location) -ChildPath $Path
+}
+
+# Convert input path to fully qualified path
+$inputPath = ConvertTo-AbsolutePath -Path $inputPath
+
+# Check if input path exists
+if (-not (Test-Path $inputPath)) {
+    Write-Host "The specified input path does not exist. Please provide a valid input path."
+    exit 1
+}
+
+$inputPath = (Resolve-Path -Path $inputPath).Path
+
+# Set container path if not specified
+if ([string]::IsNullOrWhiteSpace($containerPath)) {
+    $containerPath = "${inputPath}.hc"
+} else {
+    $containerPath = ConvertTo-AbsolutePath -Path $containerPath
+}
+
+# Check if container path already exists
+if (Test-Path $containerPath) {
+    Write-Host "The specified container path already exists. Please provide a unique path for the new container."
+    exit 1
+}
+
+# Full path to VeraCrypt executables
+$veracryptPath = "C:\Program Files\VeraCrypt"  # replace with your actual path
+$veraCryptExe = Join-Path $veracryptPath "VeraCrypt.exe"
+$veraCryptFormatExe = Join-Path $veracryptPath "VeraCrypt Format.exe"
+
+# Constants used to calculate the size of the exFAT filesystem
+$InitialVBRSize = 32KB
+$InitialFATSize = 128KB
+$ClusterSize = 32KB # TODO : make this configurable
+
+function Get-ExFATSizeRec {
+    param(
+        [string]$Path,
+        [uint64] $TotalSize
+    )
+
+    # Constants
+    $BaseMetadataSize = 32
+    $DirectoryEntrySize = 32
+
+    try {
+        # Get the item (file or directory) at the provided path
+        $item = Get-Item -Path $Path -ErrorAction Stop
+
+        # Calculate metadata size
+        $fileNameLength = $item.Name.Length
+        $metadataSize = $BaseMetadataSize + ($fileNameLength * 2)
+
+        # Calculate directory entries
+        if ($fileNameLength -gt 15) {
+            $numDirEntries = [math]::Ceiling($fileNameLength / 15) + 1
+        } else {
+            $numDirEntries = 2
+        }
+        $dirEntriesSize = $numDirEntries * $DirectoryEntrySize
+
+        # Add metadata, file size, and directory entries size to $TotalSize
+        $TotalSize += $metadataSize + $dirEntriesSize
+
+
+        if ($item.PSIsContainer) {
+            # It's a directory
+            $childItems = Get-ChildItem -Path $Path -ErrorAction Stop
+
+            foreach ($childItem in $childItems) {
+                # Recursively call this function for each child item
+                $TotalSize = Get-ExFATSizeRec -Path $childItem.FullName -TotalSize $TotalSize
+            }
+        } else {
+            # It's a file
+
+            # Calculate actual file size and round it up to the nearest multiple of $ClusterSize
+            $fileSize = $item.Length
+            $totalFileSize = [math]::Ceiling($fileSize / $ClusterSize) * $ClusterSize
+
+            # Add metadata, file size, and directory entries size to $TotalSize
+            $TotalSize += $totalFileSize
+        }
+    } catch {
+        Write-Error "Error processing item at path ${Path}: $_"
+    }
+
+    return $TotalSize
+}
+
+function Get-ExFATSize {
+    param(
+        [string]$Path
+    )
+
+    try {
+        # Initialize total size
+        $totalSize = $InitialVBRSize + $InitialFATSize
+
+        # Call the recursive function
+        $totalSize = Get-ExFATSizeRec -Path $Path -TotalSize $totalSize
+
+        # Add the root directory to $totalSize
+        $totalSize += $ClusterSize
+
+        # Calculate the size of the Bitmap Allocation Table
+        $numClusters = $totalSize / $ClusterSize
+        $bitmapSize = [math]::Ceiling($numClusters / 8)
+        $totalSize += $bitmapSize
+
+        # Adjust the size of the FAT
+        $fatSize = $numClusters * 4
+        $totalSize += $fatSize - $InitialFATSize
+
+        # Return the minimum disk size needed to store the exFAT filesystem
+        return $totalSize
+
+    } catch {
+        Write-Error "Error calculating exFAT size for path ${Path}: $_"
+        return 0
+    }
+}
+
+# Calculate size of the container
+$containerSize = Get-ExFATSize -Path $inputPath
+
+$containerSize = [math]::Ceiling($containerSize / 1MB)
+
+# Add 1 MiB to account for the VeraCrypt headers and reserved areas (256 KiB), plus other overhead
+$containerSize += 1
+
+# Specify encryption algorithm, and hash algorithm
+$encryption = "AES"
+$hash = "sha512"
+
+# Create a SecureString password
+$password = Read-Host -AsSecureString -Prompt "Enter your password"
+
+# Create a PSCredential object
+$cred = New-Object System.Management.Automation.PSCredential ("username", $password)
+
+Write-Host "Creating VeraCrypt container `"$containerPath`" ..."
+
+# Create file container using VeraCrypt Format
+# TODO: Add a switch to VeraCrypt Format to allow specifying the cluster size to use for the container
+$veraCryptFormatArgs = "/create `"$containerPath`" /size `"${containerSize}M`" /password $($cred.GetNetworkCredential().Password) /encryption $encryption /hash $hash /filesystem `"exFAT`" /quick /silent"
+Start-Process $veraCryptFormatExe -ArgumentList $veraCryptFormatArgs -NoNewWindow -Wait
+
+# Check that the container was successfully created
+if (-not (Test-Path $containerPath)) {
+    Write-Host "An error occurred while creating the VeraCrypt container."
+    exit 1
+}
+
+# Get a list of currently used drive letters
+$driveLetter = Get-Volume | Where-Object { $_.DriveLetter -ne $null } | Select-Object -ExpandProperty DriveLetter
+
+# Find the first available drive letter
+$unusedDriveLetter = (70..90 | ForEach-Object { [char]$_ } | Where-Object { $_ -notin $driveLetter })[0]
+
+# If no available drive letter was found, print an error message and exit the script
+if ($null -eq $unusedDriveLetter) {
+    # delete the file container that was created
+    Remove-Item -Path $containerPath -Force
+    Write-Error "No available drive letters found. Please free up a drive letter and try again."
+    exit 1
+}
+
+Write-Host "Mounting the newly created VeraCrypt container..."
+
+# Mount the container to the chosen drive letter as removable media
+Start-Process $veraCryptExe -ArgumentList "/volume `"$containerPath`" /letter $unusedDriveLetter /m rm /password $($cred.GetNetworkCredential().Password) /quit" -NoNewWindow -Wait
+
+# Check if the volume has been mounted successfully
+$mountedDriveRoot = "${unusedDriveLetter}:\"
+if (-not (Test-Path -Path $mountedDriveRoot)) {
+    # Volume mount failed
+    Write-Error "Failed to mount the volume. Please make sure VeraCrypt.exe is working correctly."
+    # delete the file container that was created
+    Remove-Item -Path $containerPath -Force
+    exit 1
+}
+
+Write-Host "Copying data to the mounted VeraCrypt container..."
+
+# Copy the file or directory to the mounted drive
+if (Test-Path -Path $inputPath -PathType Container) {
+    # For directories
+    Copy-Item -Path $inputPath -Destination "$($unusedDriveLetter):\" -Recurse
+} else {
+    # For files
+    Copy-Item -Path $inputPath -Destination "$($unusedDriveLetter):\"
+}
+
+Write-Host "Copying completed. Dismounting the VeraCrypt container..."
+
+# give some time for the file system to flush the data to the disk
+Start-Sleep -Seconds 5
+
+# Dismount the volume
+Start-Process $veraCryptExe -ArgumentList "/dismount $unusedDriveLetter /quit" -NoNewWindow -Wait
+
+Write-Host "VeraCrypt container created successfully."

doc/chm/VeraCrypt.hhc

@@ -95,6 +95,14 @@
 			<param name="Local" value="Mounting VeraCrypt Volumes.html">
 			</OBJECT>
 	</UL>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Normal Dismount vs Force Dismount ">
+		<param name="Local" value="Normal Dismount vs Force Dismount.html">
+		</OBJECT>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Avoid Third-Party File Extensions">
+		<param name="Local" value="Avoid Third-Party File Extensions.html">
+		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Parallelization">
 		<param name="Local" value="Parallelization.html">
@@ -175,8 +183,8 @@
 		</OBJECT>
 	<UL>
 		<LI> <OBJECT type="text/sitemap">
-			<param name="Name" value="RIPEMD-160">
+			<param name="Name" value="BLAKE2s-256">
-			<param name="Local" value="RIPEMD-160.html">
+			<param name="Local" value="BLAKE2s-256.html">
 			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="SHA-256">
@@ -390,6 +398,20 @@
 			<param name="Name" value="Source Code">
 			<param name="Local" value="Source Code.html">
 			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="Building VeraCrypt From Source">
+			<param name="Local" value="CompilingGuidelines.html">
+			</OBJECT>
+		<UL>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Windows Build Guide">
+				<param name="Local" value="CompilingGuidelineWin.html">
+				</OBJECT>
+			<LI> <OBJECT type="text/sitemap">
+				<param name="Name" value="Linux Build Guide">
+				<param name="Local" value="CompilingGuidelineLinux.html">
+				</OBJECT>
+		</UL>
 	</UL>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Contact">

doc/chm/VeraCrypt.hhp

@@ -16,7 +16,10 @@ AES.html
 arrow_right.gif
 Authenticity and Integrity.html
 Authors.html
+Avoid Third-Party File Extensions.html
 bank_30x30.png
+BC_Logo_30x30.png
+BCH_Logo_48x30.png
 Beginner's Tutorial.html
 Beginner's Tutorial_Image_001.jpg
 Beginner's Tutorial_Image_002.jpg
@@ -42,11 +45,15 @@ Beginner's Tutorial_Image_022.jpg
 Beginner's Tutorial_Image_023.gif
 Beginner's Tutorial_Image_024.gif
 Beginner's Tutorial_Image_034.png
+BLAKE2s-256.html
 Camellia.html
 Cascades.html
 Changing Passwords and Keyfiles.html
 Choosing Passwords and Keyfiles.html
 Command Line Usage.html
+CompilingGuidelineLinux.html
+CompilingGuidelines.html
+CompilingGuidelineWin.html
 Contact.html
 Contributed Resources.html
 Converting TrueCrypt volumes and partitions.html
@@ -60,12 +67,17 @@ Digital Signatures.html
 Disclaimers.html
 Documentation.html
 Donation.html
+Donation_donate.gif
 Donation_donate_CHF.gif
 Donation_donate_Dollars.gif
 Donation_donate_Euros.gif
 Donation_donate_GBP.gif
+Donation_donate_PLN.gif
 Donation_donate_YEN.gif
-Donation_VeraCrypt_Bitcoin.png
+Donation_VeraCrypt_Bitcoin_small.png
+Donation_VeraCrypt_BitcoinCash.png
+Donation_VeraCrypt_Litecoin.png
+Donation_VeraCrypt_Monero.png
 Encryption Algorithms.html
 Encryption Scheme.html
 FAQ.html
@@ -80,7 +92,6 @@ Hidden Operating System.html
 Hidden Volume.html
 Home_facebook_veracrypt.png
 Home_reddit.png
-Home_tibitDonateButton.png
 Home_utilities-file-archiver-3.png
 Home_VeraCrypt_Default_Mount_Parameters.png
 Home_VeraCrypt_menu_Default_Mount_Parameters.png
@@ -96,16 +107,20 @@ Keyfiles.html
 Kuznyechik.html
 Language Packs.html
 Legal Information.html
+liberapay_donate.svg
+LTC_Logo_30x30.png
 Main Program Window.html
 Malware.html
 Memory Dump Files.html
 Miscellaneous.html
 Modes of Operation.html
+Monero_Logo_30x30.png
 Mounting VeraCrypt Volumes.html
 Multi-User Environment.html
 Notation.html
 Paging File.html
 Parallelization.html
+paypal_30x30.png
 Personal Iterations Multiplier (PIM).html
 Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step1.png
 Personal Iterations Multiplier (PIM)_VeraCrypt_ChangePIM_Step2.png
@@ -131,7 +146,6 @@ References.html
 Release Notes.html
 Removable Medium Volume.html
 Removing Encryption.html
-RIPEMD-160.html
 Security Model.html
 Security Requirements and Precautions.html
 Security Requirements for Hidden Volumes.html

doc/chm/create_chm.bat

@@ -3,11 +3,9 @@ PATH=%PATH%;C:\Program Files (x86)\HTML Help Workshop
 set CHMBUILDPATH=%~dp0
 cd %CHMBUILDPATH%
 
-copy ..\html\* .
+xcopy /E ..\html\* .
 
 hhc VeraCrypt.hhp
 
-del /F /Q *.html *.css *.jpg *.gif *.png
+del /F /Q *.html *.css *.jpg *.gif *.png *.svg
-
+rmdir /s /Q CompilingGuidelineWin ru
-
-

doc/html/AES.html

@@ -11,7 +11,7 @@
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">

doc/html/Acknowledgements.html

@@ -11,7 +11,7 @@
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">

doc/html/Additional Security Requirements and Precautions.html

@@ -11,7 +11,7 @@
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">

doc/html/Authenticity and Integrity.html

@@ -11,7 +11,7 @@
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">

doc/html/Authors.html

@@ -11,7 +11,7 @@
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">

doc/html/Avoid Third-Party File Extensions.html

@@ -0,0 +1,85 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
+<meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
+<meta name="keywords" content="encryption, security"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Home</a></li>
+	  <li><a href="/code/">Source Code</a></li>
+	  <li><a href="Downloads.html">Downloads</a></li>
+	  <li><a class="active" href="Documentation.html">Documentation</a></li>
+	  <li><a href="Donation.html">Donate</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Documentation</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Avoid%20Third-Party%20File%20Extensions.html">Avoid Third-Party File Extensions</a>
+</p></div>
+
+<div class="wikidoc">
+	<h1>Understanding the Risks of Using Third-Party File Extensions with VeraCrypt</h1>
+	<div>
+	  <p>While VeraCrypt provides robust encryption capabilities to secure your data, using third-party file extensions for File Containers or Keyfiles could risk making the encrypted data inaccessible.<br />
+	  This guide provides an in-depth explanation of the associated risks, and it outlines recommendations for best practices to mitigate these risks.</p>
+	</div>
+	
+	<h2>Risks Associated with File Containers</h2>
+	<div>
+	  <p>Using a third-party file extension for File Containers exposes you to several risks:</p>
+	  <ul>
+		<li>Overwritten Metadata: Third-party applications may update their metadata, which could overwrite crucial parts of the File Container.</li>
+		<li>Unintentional Changes: Accidentally launching a File Container with a third-party application could modify its metadata without your consent.</li>
+		<li>Container Corruption: These actions could render the container unreadable or unusable.</li>
+		<li>Data Loss: The data within the container might be permanently lost if the container becomes corrupted.</li>
+	  </ul>
+	</div>
+	
+	<h2>Risks Associated with Keyfiles</h2>
+	<div>
+	  <p>Similar risks are associated with Keyfiles:</p>
+	  <ul>
+		<li>Keyfile Corruption: Inadvertently modifying a Keyfile with a third-party application can make it unusable for decryption.</li>
+		<li>Overwritten Data: Third-party applications may overwrite the portion of the Keyfile that VeraCrypt uses for decryption.</li>
+		<li>Unintentional Changes: Accidental changes can make it impossible to mount the volume unless you have an unaltered backup of the Keyfile.</li>
+	  </ul>
+	</div>
+	
+	<h2>Examples of Extensions to Avoid</h2>
+	<div>
+	  <p>Avoid using the following types of third-party file extensions:</p>
+	  <ul>
+		<li>Media Files: Picture, audio, and video files are subject to metadata changes by their respective software.</li>
+		<li>Archive Files: Zip files can be easily modified, which could disrupt the encrypted volume.</li>
+		<li>Executable Files: Software updates can modify these files, making them unreliable as File Containers or Keyfiles.</li>
+		<li>Document Files: Office and PDF files can be automatically updated by productivity software, making them risky to use.</li>
+	  </ul>
+	</div>
+	
+	<h2>Recommendations</h2>
+	<div>
+	  <p>For secure usage, consider the following best practices:</p>
+	  <ul>
+		<li>Use neutral file extensions for File Containers and Keyfiles to minimize the risk of automatic file association.</li>
+		<li>Keep secure backups of your File Containers and Keyfiles in locations isolated from network access.</li>
+		<li>Disable auto-open settings for the specific file extensions you use for VeraCrypt File Containers and Keyfiles.</li>
+		<li>Always double-check file associations and be cautious when using a new device or third-party application.</li>
+	  </ul>
+	</div>
+	
+<div class="ClearBoth"></div></body></html>

doc/html/BLAKE2s-256.html

@@ -11,7 +11,7 @@
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
@@ -31,15 +31,21 @@
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Hash%20Algorithms.html">Hash Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
-<a href="RIPEMD-160.html">RIPEMD-160</a>
+<a href="BLAKE2s-256.html">BLAKE2s-256</a>
 </p></div>
 
 <div class="wikidoc">
-<h1>RIPEMD-160</h1>
+<h1>BLAKE2s-256</h1>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-RIPEMD-160, published in 1996, is a hash algorithm designed by Hans Dobbertin, Antoon Bosselaers, and Bart Preneel in an open academic community. The size of the output of RIPEMD-160 is 160 bits. RIPEMD-160 is a strengthened version of the RIPEMD hash algorithm
+<p>
- that was developed in the framework of the European Union's project RIPE (<em style="text-align:left">RACE Integrity Primitives Evaluation</em>), 1988-1992. RIPEMD-160 was adopted by the International Organization for Standardization (ISO) and the IEC in the
+BLAKE2 is a cryptographic hash function based on BLAKE, created by Jean-Philippe Aumasson, Samuel Neves, Zooko Wilcox-O'Hearn, and Christian Winnerlein. It was announced on December 21, 2012. The design goal was to replace the widely used, but broken, MD5 and SHA-1 algorithms in applications requiring high performance in software. BLAKE2 provides better security than SHA-2 and similar to that of SHA-3 (e.g. immunity to length extension, indifferentiability from a random oracle, etc...).<br/>
- ISO/IEC 10118-3:2004 international standard [21].</div>
+BLAKE2 removes addition of constants to message words from BLAKE round function, changes two rotation constants, simplifies padding, adds parameter block that is XOR'ed with initialization vectors, and reduces the number of rounds from 16 to 12 for BLAKE2b (successor of BLAKE-512), and from 14 to 10 for BLAKE2s (successor of BLAKE-256).<br/>
+BLAKE2b and BLAKE2s are specified in RFC 7693.
+</p>
+<p>
+VeraCrypt uses only BLAKE2s with its maximum output size of 32-bytes (256 bits).
+</p>
+</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <a href="SHA-256.html" style="text-align:left; color:#0080c0; text-decoration:none; font-weight:bold.html">Next Section &gt;&gt;</a></div>
 </div><div class="ClearBoth"></div></body></html>

doc/html/Beginner's Tutorial.html

@@ -11,7 +11,7 @@
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
@@ -39,11 +39,11 @@
 <h4>STEP 1:</h4>
 <p>If you have not done so, download and install VeraCrypt. Then launch VeraCrypt by double-clicking the file VeraCrypt.exe or by clicking the VeraCrypt shortcut in your Windows Start menu.</p>
 <h4>STEP 2:</h4>
-<p><img src="Beginner's Tutorial_Image_001.jpg" alt="" width="579" height="498"><br>
+<p><img src="Beginner's Tutorial_Image_001.jpg" alt=""><br>
 <br>
 The main VeraCrypt window should appear. Click <strong>Create Volume </strong>(marked with a red rectangle for clarity).</p>
 <h4>STEP 3:</h4>
-<p><img src="Beginner's Tutorial_Image_002.jpg" alt="" width="616" height="410"><br>
+<p><img src="Beginner's Tutorial_Image_002.jpg" alt=""><br>
 <br>
 The VeraCrypt Volume Creation Wizard window should appear.<br>
 <br>
@@ -53,13 +53,13 @@ In this step you need to choose where you wish the VeraCrypt volume to be create
 As the option is selected by default, you can just click <strong>Next</strong>.</p>
 <p>Note: In the following steps, the screenshots will show only the right-hand part of the Wizard window.</p>
 <h4>STEP 4:</h4>
-<p><img src="Beginner's Tutorial_Image_003.jpg" alt="" width="371" height="333"><br>
+<p><img src="Beginner's Tutorial_Image_003.jpg" alt=""><br>
 <br>
 In this step you need to choose whether to create a standard or hidden VeraCrypt volume. In this tutorial, we will choose the former option and create a standard VeraCrypt volume.<br>
 <br>
 As the option is selected by default, you can just click <strong>Next</strong>.</p>
 <h4>STEP 5:</h4>
-<p><img src="Beginner's Tutorial_Image_004.jpg" alt="" width="363" height="336"><br>
+<p><img src="Beginner's Tutorial_Image_004.jpg" alt=""><br>
 <br>
 In this step you have to specify where you wish the VeraCrypt volume (file container) to be created. Note that a VeraCrypt container is just like any normal file. It can be, for example, moved or deleted as any normal file. It also needs a filename, which you
  will choose in the next step.<br>
@@ -68,11 +68,11 @@ Click <strong>Select File</strong>.<br>
 <br>
 The standard Windows file selector should appear (while the window of the VeraCrypt Volume Creation Wizard remains open in the background).</p>
 <h4>STEP 6:</h4>
-<p><img src="Beginner's Tutorial_Image_005.jpg" alt="" width="720" height="452"><br>
+<p><img src="Beginner's Tutorial_Image_005.jpg" alt=""><br>
 <br>
 In this tutorial, we will create our VeraCrypt volume in the folder F<em>:\Data\ </em>
-and the filename of the volume (container) will be <em>My Volume </em>(as can be seen in the screenshot above). You may, of course, choose any other filename and location you like (for example, on a USB memory stick). Note that the file
+and the filename of the volume (container) will be <em>MyVolume.hc </em>(as can be seen in the screenshot above). You may, of course, choose any other filename and location you like (for example, on a USB memory stick). Note that the file
-<em>My Volume </em>does not exist yet &ndash; VeraCrypt will create it.</p>
+<em>MyVolume.hc </em>does not exist yet &ndash; VeraCrypt will create it.</p>
 <p>IMPORTANT: Note that VeraCrypt will <em>not </em>encrypt any existing files (when creating a VeraCrypt file container). If you select an existing file in this step, it will be overwritten and replaced by the newly created volume (so the overwritten file
  will be <em>lost</em>, <em>not </em>encrypted). You will be able to encrypt existing files (later on) by moving them to the VeraCrypt volume that we are creating now.*</p>
 <p>Select the desired path (where you wish the container to be created) in the file selector. Type the desired container file name in the
@@ -85,23 +85,23 @@ The file selector window should disappear.<br>
 In the following steps, we will return to the VeraCrypt Volume Creation Wizard.</p>
 <p>* Note that after you copy existing unencrypted files to a VeraCrypt volume, you should securely erase (wipe) the original unencrypted files. There are software tools that can be used for the purpose of secure erasure (many of them are free).</p>
 <h4>STEP 7:</h4>
-<p><img src="Beginner's Tutorial_Image_007.jpg" alt="" width="360" height="335"><br>
+<p><img src="Beginner's Tutorial_Image_007.jpg" alt=""><br>
 <br>
 In the Volume Creation Wizard window, click <strong>Next</strong>.</p>
 <h4>STEP 8:</h4>
-<p><img src="Beginner's Tutorial_Image_008.jpg" alt="" width="359" height="331"><br>
+<p><img src="Beginner's Tutorial_Image_008.jpg" alt=""><br>
 <br>
 Here you can choose an encryption algorithm and a hash algorithm for the volume. If you are not sure what to select here, you can use the default settings and click
 <strong>Next </strong>(for more information, see chapters <a href="Encryption Algorithms.html">
 <em>Encryption Algorithms</em></a> and <a href="Hash%20Algorithms.html">
 <em>Hash Algorithms</em></a>).</p>
 <h4>STEP 9:</h4>
-<p><img src="Beginner's Tutorial_Image_009.jpg" alt="" width="369" height="332"><br>
+<p><img src="Beginner's Tutorial_Image_009.jpg" alt=""><br>
 <br>
 Here we specify that we wish the size of our VeraCrypt container to be 250 megabyte. You may, of course, specify a different size. After you type the desired size in the input field (marked with a red rectangle), click
 <strong>Next</strong>.</p>
 <h4>STEP 10:</h4>
-<p><img src="Beginner's Tutorial_Image_010.jpg" alt="" width="372" height="368"><br>
+<p><img src="Beginner's Tutorial_Image_010.jpg" alt=""><br>
 <br>
 This is one of the most important steps. Here you have to choose a good volume password. Read carefully the information displayed in the Wizard window about what is considered a good password.<br>
 <br>
@@ -109,22 +109,22 @@ After you choose a good password, type it in the first input field. Then re-type
 <strong>Next</strong>.</p>
 <p>Note: The button <strong>Next </strong>will be disabled until passwords in both input fields are the same.</p>
 <h4>STEP 11:</h4>
-<p><img src="Beginner's Tutorial_Image_011.jpg" alt="" width="365" height="368"><br>
+<p><img src="Beginner's Tutorial_Image_011.jpg" alt=""><br>
 <br>
 Move your mouse as randomly as possible within the Volume Creation Wizard window at least until the randomness indicator becomes green. The longer you move the mouse, the better (moving the mouse for at least 30 seconds is recommended). This significantly increases
  the cryptographic strength of the encryption keys (which increases security).<br>
 <br>
 Click <strong>Format</strong>.<br>
 <br>
-Volume creation should begin. VeraCrypt will now create a file called <em>My Volume
+Volume creation should begin. VeraCrypt will now create a file called <em>MyVolume.hc
 </em>in the folder F<em>:\Data\ </em>(as we specified in Step 6). This file will be a VeraCrypt container (it will contain the encrypted VeraCrypt volume). Depending on the size of the volume, the volume creation may take a long time. After it finishes, the
  following dialog box will appear:<br>
 <br>
-<img src="Beginner's Tutorial_Image_012.jpg" alt="" width="398" height="171"><br>
+<img src="Beginner's Tutorial_Image_012.jpg" alt=""><br>
 <br>
 Click <strong>OK </strong>to close the dialog box.</p>
 <h4>STEP 12:</h4>
-<p><img src="Beginner's Tutorial_Image_013.jpg" alt="" width="361" height="333"><br>
+<p><img src="Beginner's Tutorial_Image_013.jpg" alt=""><br>
 <br>
 We have just successfully created a VeraCrypt volume (file container). In the VeraCrypt Volume Creation Wizard window, click
 <strong>Exit</strong>.<br>
@@ -133,19 +133,19 @@ The Wizard window should disappear.<br>
 <br>
 In the remaining steps, we will mount the volume we just created. We will return to the main VeraCrypt window (which should still be open, but if it is not, repeat Step 1 to launch VeraCrypt and then continue from Step 13.)</p>
 <h4>STEP 13:</h4>
-<p><img src="Beginner's Tutorial_Image_014.jpg" alt="" width="579" height="498"><br>
+<p><img src="Beginner's Tutorial_Image_014.jpg" alt=""><br>
 <br>
 Select a drive letter from the list (marked with a red rectangle). This will be the drive letter to which the VeraCrypt container will be mounted.<br>
 <br>
 Note: In this tutorial, we chose the drive letter M, but you may of course choose any other available drive letter.</p>
 <h4>STEP 14:</h4>
-<p><img src="Beginner's Tutorial_Image_015.jpg" alt="" width="579" height="498"><br>
+<p><img src="Beginner's Tutorial_Image_015.jpg" alt=""><br>
 <br>
 Click <strong>Select File</strong>.<br>
 <br>
 The standard file selector window should appear.</p>
 <h4>STEP 15:</h4>
-<p><img src="Beginner's Tutorial_Image_016.jpg" alt="" width="625" height="453"><br>
+<p><img src="Beginner's Tutorial_Image_016.jpg" alt=""><br>
 <br>
 In the file selector, browse to the container file (which we created in Steps 6-12) and select it. Click
 <strong>Open </strong>(in the file selector window).<br>
@@ -154,15 +154,15 @@ The file selector window should disappear.<br>
 <br>
 In the following steps, we will return to the main VeraCrypt window.</p>
 <h4>STEP 16:</h4>
-<p><img src="Beginner's Tutorial_Image_017.jpg" alt="" width="579" height="498"><br>
+<p><img src="Beginner's Tutorial_Image_017.jpg" alt=""><br>
 <br>
 In the main VeraCrypt window, click <strong>Mount</strong>. Password prompt dialog window should appear.</p>
 <h4>STEP 17:</h4>
-<p><img src="Beginner's Tutorial_Image_018.jpg" alt="" width="499" height="205"><br>
+<p><img src="Beginner's Tutorial_Image_018.jpg" alt=""><br>
 <br>
 Type the password (which you specified in Step 10) in the password input field (marked with a red rectangle).</p>
 <h4>STEP 18:</h4>
-<p><img src="Beginner's Tutorial_Image_019.jpg" alt="" width="499" height="205"><br>
+<p><img src="Beginner's Tutorial_Image_019.jpg" alt=""><br>
 <br>
 Select the PRF algorithm that was used during the creation of the volume (SHA-512 is the default PRF used by VeraCrypt). If you don&rsquo;t remember which PRF was used, just leave it set to &ldquo;autodetection&rdquo; but the mounting process will take more
  time. Click <strong>OK</strong> after entering the password.<br>
@@ -170,7 +170,7 @@ Select the PRF algorithm that was used during the creation of the volume (SHA-51
 VeraCrypt will now attempt to mount the volume. If the password is incorrect (for example, if you typed it incorrectly), VeraCrypt will notify you and you will need to repeat the previous step (type the password again and click
 <strong>OK</strong>). If the password is correct, the volume will be mounted.</p>
 <h4>FINAL STEP:</h4>
-<p><img src="Beginner's Tutorial_Image_020.jpg" alt="" width="579" height="498"><br>
+<p><img src="Beginner's Tutorial_Image_020.jpg" alt=""><br>
 <br>
 We have just successfully mounted the container as a virtual disk M:<br>
 <br>
@@ -182,7 +182,7 @@ If you open a file stored on a VeraCrypt volume, for example, in media player, t
 <p>You can also browse to the mounted volume the way you normally browse to any other types of volumes. For example, by opening the &lsquo;<em>Computer</em>&rsquo; (or &lsquo;<em>My Computer</em>&rsquo;) list and double clicking the corresponding drive letter
  (in this case, it is the letter M).<br>
 <br>
-<img src="Beginner's Tutorial_Image_021.jpg" alt="" width="406" height="264"><br>
+<img src="Beginner's Tutorial_Image_021.jpg" alt=""><br>
 <br>
 You can copy files (or folders) to and from the VeraCrypt volume just as you would copy them to any normal disk (for example, by simple drag-and-drop operations). Files that are being read or copied from the encrypted VeraCrypt volume are automatically decrypted
  on the fly in RAM (memory). Similarly, files that are being written or copied to the VeraCrypt volume are automatically encrypted on the fly in RAM (right before they are written to the disk).<br>
@@ -192,7 +192,7 @@ Note that VeraCrypt never saves any decrypted data to a disk &ndash; it only sto
  again, you have to mount the volume. To do so, repeat Steps 13-18.</p>
 <p>If you want to close the volume and make files stored on it inaccessible, either restart your operating system or dismount the volume. To do so, follow these steps:<br>
 <br>
-<img src="Beginner's Tutorial_Image_022.jpg" alt="" width="579" height="498"><br>
+<img src="Beginner's Tutorial_Image_022.jpg" alt=""><br>
 <br>
 Select the volume from the list of mounted volumes in the main VeraCrypt window (marked with a red rectangle in the screenshot above) and then click
 <strong>Dismount </strong>(also marked with a red rectangle in the screenshot above). To make files stored on the volume accessible again, you will have to mount the volume. To do so, repeat Steps 13-18.</p>

doc/html/Camellia.html

@@ -11,7 +11,7 @@
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">

doc/html/Cascades.html

@@ -11,7 +11,7 @@
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
@@ -47,6 +47,31 @@
 <em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Serpent (256-bit key) in XTS mode, then with Twofish (256-bit key) in XTS mode, and finally with AES (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption
  keys are mutually independent (note that header keys are independent too, even though they are derived from a single password &ndash; see the section
 <a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
+<h2>Camellia-Kuznyechik</h2>
+<p>Two ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
+<em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Kuznyechik (256-bit key) in XTS mode and then with Camellia (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that
+ header keys are independent too, even though they are derived from a single password &ndash; see the section
+<a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
+<h2>Camellia-Serpent</h2>
+<p>Two ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
+<em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Serpent (256-bit key) in XTS mode and then with Camellia (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that
+ header keys are independent too, even though they are derived from a single password &ndash; see the section
+<a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
+<h2>Kuznyechik-AES</h2>
+<p>Two ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
+<em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with AES (256-bit key) in XTS mode and then with Kuznyechik (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that
+ header keys are independent too, even though they are derived from a single password &ndash; see the section
+<a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
+<h2>Kuznyechik-Serpent-Camellia</h2>
+<p>Three ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
+<em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Camellia (256-bit key) in XTS mode, then with Serpent (256- bit key) in XTS mode, and finally with Kuznyechik (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All
+ encryption keys are mutually independent (note that header keys are independent too, even though they are derived from a single password &ndash; see the section
+<a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
+<h2>Kuznyechik-Twofish</h2>
+<p>Two ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
+<em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with Twofish (256-bit key) in XTS mode and then with Kuznyechik (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that
+ header keys are independent too, even though they are derived from a single password &ndash; see the section
+<a href="Header Key Derivation.html"><em>Header Key Derivation, Salt, and Iteration Count</em></a>). See above for information on the individual cascaded ciphers.</p>
 <h2>Serpent-AES</h2>
 <p>Two ciphers in a cascade [15, 16] operating in XTS mode (see the section <a href="Modes%20of%20Operation.html">
 <em>Modes of Operation</em></a>). Each 128-bit block is first encrypted with AES (256-bit key) in XTS mode and then with Serpent (256-bit key) in XTS mode. Each of the cascaded ciphers uses its own key. All encryption keys are mutually independent (note that

doc/html/Changing Passwords and Keyfiles.html

@@ -11,7 +11,7 @@
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">

doc/html/Choosing Passwords and Keyfiles.html

@@ -11,7 +11,7 @@
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">

doc/html/Command Line Usage.html

@@ -11,7 +11,7 @@
 <body>
 
 <div>
-<a href="https://www.veracrypt.fr/en/Home.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
 </div>
 
 <div id="menu">
@@ -37,7 +37,7 @@
 <h1>Command Line Usage</h1>
 <p>Note that this section applies to the Windows version of VeraCrypt. For information on command line usage applying to the
 <strong>Linux and Mac OS X versions</strong>, please run: veracrypt &ndash;h</p>
-<table border="1" cellspacing="0" cellpadding="0">
+<table border="1" cellspacing="0" cellpadding="1">
 <tbody>
 <tr>
 <td><em>/help</em> or <em>/?</em></td>
@@ -49,7 +49,7 @@
 </tr>
 <tr>
 <td><em>/hash</em></td>
-<td>It must be followed by a parameter indicating the PRF hash algorithm to use when mounting the volume. Possible values for /hash parameter are: sha256, sha-256, sha512, sha-512, whirlpool, ripemd160 and ripemd-160. When /hash is omitted, VeraCrypt will try
+<td>It must be followed by a parameter indicating the PRF hash algorithm to use when mounting the volume. Possible values for /hash parameter are: sha256, sha-256, sha512, sha-512, whirlpool, blake2s and blake2s-256. When /hash is omitted, VeraCrypt will try
  all possible PRF algorithms thus lengthening the mount operation time.</td>
 </tr>
 <tr>
@@ -107,8 +107,8 @@ If it is followed by <strong>n</strong> or <strong>no</strong>: force the displa
 </tr>
 <tr>
 <td><em>/secureDesktop</em></td>
-<td>If it is followed by <strong>y</strong> or <strong>yes</strong> or if no parameter is specified: display password dialog in a dedicated secure desktop to protect against certain types of attacks.<br>
+<td>If it is followed by <strong>y</strong> or <strong>yes</strong> or if no parameter is specified: display password dialog and token PIN dialog in a dedicated secure desktop to protect against certain types of attacks.<br>
-If it is followed by <strong>n</strong> or <strong>no</strong>: the password dialog is displayed in the normal desktop.</td>
+If it is followed by <strong>n</strong> or <strong>no</strong>: the password dialog and token PIN dialog are displayed in the normal desktop.</td>
 </tr>
 <tr>
 <td><em>/tokenlib</em></td>
@@ -123,6 +123,7 @@ If it is followed by <strong>n</strong> or <strong>no</strong>: the password dia
 <td><em>/cache</em> or <em>/c</em></td>
 <td>If it is followed by <strong>y</strong> or <strong>yes</strong> or if no parameter is specified: enable password cache;
 <br>
+If it is followed by <strong>p </strong>or<strong> pim</strong>: enable both password and PIM cache (e.g., /c p).<br>
 If it is followed by <strong>n </strong>or<strong> no</strong>: disable password cache (e.g., /c n).<br>
 If it is followed by <strong>f </strong>or<strong> favorites</strong>: temporary cache password when mounting multiple favorites&nbsp; (e.g., /c f).<br>
 Note that turning the password cache off will not clear it (use /w to clear the password cache).</td>
@@ -170,11 +171,25 @@ Note that turning the password cache off will not clear it (use /w to clear the
 <p><strong>recovery</strong>: Do not verify any checksums stored in the volume header. This option should be used only when the volume header is damaged and the volume cannot be mounted even with the mount option headerbak. Example: /m ro</p>
 <p><strong>label=LabelValue</strong>: Use the given string value <strong>LabelValue</strong> as a label of the mounted volume in Windows Explorer. The maximum length for
 <strong>LabelValue&nbsp;</strong> is 32 characters for NTFS volumes and 11 characters for FAT volumes. For example,
-<em>/m label=MyDrive</em> will set the label of the drive in Explorer to <em>MyDrive</em>.<br>
+<em>/m label=MyDrive</em> will set the label of the drive in Explorer to <em>MyDrive</em>.</p>
-<br>
+<p><strong>noattach</strong>: Only create virtual device without actually attaching the mounted volume to the selected drive letter.</p>
-Please note that this switch may be present several times in the command line in order to specify multiple mount options (e.g.: /m rm /m ts)</p>
+<p>Please note that this switch may be present several times in the command line in order to specify multiple mount options (e.g.: /m rm /m ts)</p>
 </td>
 </tr>
+<tr>
+<td><em>/DisableDeviceUpdate</em>&nbsp;</td>
+<td>Disables periodic internel check on devices connected to the system that is used for handling favorites identified with VolumeID and replace it with on-demande checks.</td>
+</tr>
+<tr>
+<td><em>/protectMemory</em>&nbsp;</td>
+<td>Activates a mechanism that protects VeraCrypt process memory from being accessed by other non-admin processes.</td>
+</tr>
+<tr>
+<td><em>/signalExit</em>&nbsp;</td>
+<td>It must be followed by a parameter specifying the name of the signal to send to unblock a waiting <a href="https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/waitfor" target="_blank">WAITFOR.EXE</a> command when VeraCrypt exists.<br>
+The name of signal must be the same as the one specified to WAITFOR.EXE command (e.g."veracrypt.exe /q /v test.hc /l Z /signal SigName" followed by "waitfor.exe SigName"<br>
+This switch is ignored if /q is not specified</td>
+</tr>
 </tbody>
 </table>
 <h4>VeraCrypt Format.exe (VeraCrypt Volume Creation Wizard):</h4>
@@ -200,6 +215,23 @@ It must be followed by a parameter indicating the size of the container file tha
 It must be followed by a parameter indicating the password of the container that will be created.</td>
 </tr>
 <tr>
+<td>&nbsp;/keyfile or /k</td>
+<td>&nbsp;(Only with /create)<br>
+It must be followed by a parameter specifying a keyfile or a keyfile search path. For multiple keyfiles, specify e.g.: /k c:\keyfile1.dat /k d:\KeyfileFolder /k c:\kf2 To specify a keyfile stored on a security token or smart card, use the following syntax:
+ token://slot/SLOT_NUMBER/file/FILE_NAME</td>
+</tr>
+<tr>
+<td><em>/tokenlib</em></td>
+<td>&nbsp;(Only with /create)<br>
+It must be followed by a parameter indicating the PKCS #11 library to use for security tokens and smart cards. (e.g.: /tokenlib c:\pkcs11lib.dll)</td>
+</tr>
+<tr>
+<td><em>/tokenpin</em></td>
+<td>&nbsp;(Only with /create)<br>
+It must be followed by a parameter indicating the PIN to use in order to authenticate to the security token or smart card (e.g.: /tokenpin 0000). Warning: This method of entering a smart card PIN may be insecure, for example, when an unencrypted command
+ prompt history log is being saved to unencrypted disk.</td>
+</tr>
+<tr>
 <td>&nbsp;<em>/hash</em></td>
 <td>(Only with /create)<br>
 It must be followed by a parameter indicating the PRF hash algorithm to use when creating the volume. It has the same syntax as VeraCrypt.exe.</td>
@@ -209,7 +241,13 @@ It must be followed by a parameter indicating the PRF hash algorithm to use when
 <td>(Only with /create)<br>
 It must be followed by a parameter indicating the encryption algorithm to use. The default is AES if this switch is not specified. The parameter can have the following values (case insensitive):
 <ul>
-<li>AES </li><li>Serpent </li><li>Twofish </li><li>AES(Twofish) </li><li>AES(Twofish(Serpent)) </li><li>Serpent(AES) </li><li>Serpent(Twofish(AES)) </li><li>Twofish(Serpent) </li></ul>
+<li>AES </li><li>Serpent </li><li>Twofish </li><li>Camellia </li><li>Kuznyechik </li><li>AES(Twofish) </li><li>AES(Twofish(Serpent)) </li><li>Serpent(AES) </li><li>Serpent(Twofish(AES)) </li><li>Twofish(Serpent) </li>
+<li>Camellia(Kuznyechik) </li>
+<li>Kuznyechik(Twofish) </li>
+<li>Camellia(Serpent) </li>
+<li>Kuznyechik(AES) </li>
+<li>Kuznyechik(Serpent(Camellia)) </li>
+</ul>
 </td>
 </tr>
 <tr>
@@ -218,7 +256,10 @@ It must be followed by a parameter indicating the encryption algorithm to use. T
 It must be followed by a parameter indicating the file system to use for the volume. The parameter can have the following values:
 <ul>
 <li>None: don't use any filesystem </li><li>FAT: format using FAT/FAT32 </li><li>NTFS: format using NTFS. Please note that in this case a UAC prompt will be displayed unless the process is run with full administrative privileges.
-</li></ul>
+</li>
+<li>ExFAT: format using ExFAT. This switch is available starting from Windows Vista SP1 </li>
+<li>ReFS: format using ReFS. This switch is available starting from Windows 10 </li>
+</ul>
 </td>
 </tr>
 <tr>
@@ -241,13 +282,34 @@ It has no parameters and it indicates that no message box or dialog will be disp
 <td>Do not verify that VeraCrypt Rescue Disks are correctly burned. <strong>WARNING</strong>: Never attempt to use this option to facilitate the reuse of a previously created VeraCrypt Rescue Disk. Note that every time you encrypt a system partition/drive,
  you must create a new VeraCrypt Rescue Disk even if you use the same password. A previously created VeraCrypt Rescue Disk cannot be reused as it was created for a different master key.</td>
 </tr>
+<tr>
+<td>/nosizecheck</td>
+<td>Don't check that the given size of the file container is smaller than the available disk free. This applies to both UI and command line.</td>
+</tr>
+<tr>
+<td>/quick</td>
+<td>Perform quick formatting of volumes instead of full formatting. This applies to both UI and command line.</td>
+</tr>
+<tr>
+<td>/FastCreateFile</td>
+<td>Enables a faster, albeit potentially insecure, method for creating file containers. This option carries security risks as it can embed existing disk content into the file container, possibly exposing sensitive data if an attacker gains access to it. Note that this switch affects all file container creation methods, whether initiated from the command line, using the /create switch, or through the UI wizard.</td>
+</tr>
+<tr>
+<td><em>/protectMemory</em>&nbsp;</td>
+<td>Activates a mechanism that protects VeraCrypt Format process memory from being accessed by other non-admin processes.</td>
+</tr>
+<tr>
+<td><em>/secureDesktop</em></td>
+<td>If it is followed by <strong>y</strong> or <strong>yes</strong> or if no parameter is specified: display password dialog and token PIN dialog in a dedicated secure desktop to protect against certain types of attacks.<br>
+If it is followed by <strong>n</strong> or <strong>no</strong>: the password dialog and token PIN dialog are displayed in the normal desktop.</td>
+</tr>
 </tbody>
 </table>
 <h4>Syntax</h4>
-<p>VeraCrypt.exe [/tc] [/hash {sha256|sha-256|sha512|sha-512|whirlpool |ripemd160|ripemd-160}][/a [devices|favorites]] [/b] [/c [y|n|f]] [/d [drive letter]] [/e] [/f] [/h [y|n]] [/k keyfile or search path] [tryemptypass [y|n]] [/l drive letter] [/m {bk|rm|recovery|ro|sm|ts}]
+<p>VeraCrypt.exe [/tc] [/hash {sha256|sha-256|sha512|sha-512|whirlpool |blake2s|blake2s-256}][/a [devices|favorites]] [/b] [/c [y|n|f]] [/d [drive letter]] [/e] [/f] [/h [y|n]] [/k keyfile or search path] [tryemptypass [y|n]] [/l drive letter] [/m {bk|rm|recovery|ro|sm|ts|noattach}]
  [/p password] [/pim pimvalue] [/q [background|preferences]] [/s] [/tokenlib path] [/v volume] [/w]</p>
-<p>&quot;VeraCrypt Format.exe&quot; [/n] [/create] [/size number[{K|M|G|T}]] [/p password]&nbsp; [/encryption {AES | Serpent | Twofish | AES(Twofish) | AES(Twofish(Serpent)) | Serpent(AES) | Serpent(Twofish(AES)) | Twofish(Serpent)}] [/hash {sha256|sha-256|sha512|sha-512|whirlpool|ripemd160|ripemd-160}]
+<p>&quot;VeraCrypt Format.exe&quot; [/n] [/create] [/size number[{K|M|G|T}]] [/p password]&nbsp; [/encryption {AES | Serpent | Twofish | Camellia | Kuznyechik | AES(Twofish) | AES(Twofish(Serpent)) | Serpent(AES) | Serpent(Twofish(AES)) | Twofish(Serpent) | Camellia(Kuznyechik) | Kuznyechik(Twofish) | Camellia(Serpent) | Kuznyechik(AES) | Kuznyechik(Serpent(Camellia))}] [/hash {sha256|sha-256|sha512|sha-512|whirlpool|blake2s|blake2s-256}]
- [/filesystem {None|FAT|NTFS}] [/dynamic] [/force] [/silent]</p>
+ [/filesystem {None|FAT|NTFS|ExFAT|ReFS}] [/dynamic] [/force] [/silent] [/noisocheck] [FastCreateFile] [/quick]</p>
 <p>Note that the order in which options are specified does not matter.</p>
 <h4>Examples</h4>
 <p>Mount the volume <em>d:\myvolume</em> as the first free drive letter, using the password prompt (the main program window will not be displayed):</p>

doc/html/CompilingGuidelineLinux.html

@@ -0,0 +1,314 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<style>
+.textbox {
+  vertical-align: top;
+  height: auto !important;
+  font-family: Helvetica,sans-serif;
+  font-size: 20px;
+  font-weight: bold;
+  margin: 10px;
+  padding: 10px;
+  background-color: white;
+  width: auto;
+  border-radius: 10px;
+}
+
+.texttohide {
+  font-family: Helvetica,sans-serif;
+  font-size: 14px;
+  font-weight: normal;
+}
+
+
+</style>
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<title>VeraCrypt - Free Open source disk encryption with strong security for the Paranoid</title>
+<meta name="description" content="VeraCrypt is free open-source disk encryption software for Windows, Mac OS X and Linux. In case an attacker forces you to reveal the password, VeraCrypt provides plausible deniability. In contrast to file encryption, data encryption performed by VeraCrypt is real-time (on-the-fly), automatic, transparent, needs very little memory, and does not involve temporary unencrypted files."/>
+<meta name="keywords" content="encryption, security"/>
+<link href="styles.css" rel="stylesheet" type="text/css" />
+</head>
+<body>
+
+<div>
+<a href="Documentation.html"><img src="VeraCrypt128x128.png" alt="VeraCrypt"/></a>
+</div>
+
+<div id="menu">
+	<ul>
+	  <li><a href="Home.html">Home</a></li>
+	  <li><a href="/code/">Source Code</a></li>
+	  <li><a href="Downloads.html">Downloads</a></li>
+	  <li><a class="active" href="Documentation.html">Documentation</a></li>
+	  <li><a href="Donation.html">Donate</a></li>
+	  <li><a href="https://sourceforge.net/p/veracrypt/discussion/" target="_blank">Forums</a></li>
+	</ul>
+</div>
+
+<div>
+<p>
+<a href="Documentation.html">Documentation</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="Technical%20Details.html">Technical Details</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="CompilingGuidelines.html">Building VeraCrypt From Source</a>
+<img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
+<a href="CompilingGuidelineLinux.html">Linux Build Guide</a>
+</p></div>
+
+<div class="wikidoc">
+This guide describes how to set up a Linux System to build VeraCrypt from source and how to perform compilation. <br>
+The procedure for a Ubuntu 22.04 LTS system is described here as an example, the procedure for other Linux systems is analogous.
+</div>
+
+<div class="wikidoc">
+<br>
+<br>
+The following components are required for compiling VeraCrypt:
+<ol>
+	<li>GNU Make</li>
+	<li>GNU C/C++ Compiler</li>
+	<li>YASM 1.3.0</li>
+	<li>pkg-config</li>
+	<li>wxWidgets 3.x shared library and header files installed by the system or wxWidgets 3.x library source code </li>
+	<li>FUSE library and header files</li>
+	<li>PCSC-lite library and header files</li>
+</ol>
+</div>
+
+<div class="wikidoc">
+<p>Below are the procedure steps. Clicking on any of the link takes directly to the related step:
+<ul>
+<li><strong><a href="#InstallationOfGNUMake">Installation of GNU Make</a></li></strong>
+<li><strong><a href="#InstallationOfGNUCompiler">Installation of GNU C/C++ Compiler</a></li></strong>
+<li><strong><a href="#InstallationOfYASM">Installation of YASM</a></li></strong>
+<li><strong><a href="#InstallationOfPKGConfig">Installation of pkg-config</a></li></strong>
+<li><strong><a href="#InstallationOfwxWidgets">Installation of wxWidgets 3.2</a></li></strong>
+<li><strong><a href="#InstallationOfFuse">Installation of libfuse</a></li></strong>
+<li><strong><a href="#InstallationOfPCSCLite">Installation of libpcsclite</a></li></strong>
+<li><strong><a href="#DownloadVeraCrypt">Download VeraCrypt</a></li></strong>
+<li><strong><a href="#CompileVeraCrypt">Compile VeraCrypt</a></li></strong>
+</ul>
+</p>
+<p>They can also be performed by running the below list of commands in a terminal or by copying them to a script:<br>
+<code>
+sudo apt update <br>
+sudo apt install -y build-essential yasm pkg-config libwxgtk3.0-gtk3-dev <br>
+sudo apt install -y libfuse-dev git libpcsclite-dev <br>
+git clone https://github.com/veracrypt/VeraCrypt.git <br>
+cd ~/VeraCrypt/src <br>
+make
+</code>
+</p>
+</div>
+
+<div class="wikidoc">
+ <div class="textbox" id="InstallationOfGNUMake">
+  <a href="#InstallationOfGNUMake">Installation of GNU Make</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install build-essential
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfGNUCompiler">
+  <a href="#InstallationOfGNUCompiler">Installation of GNU C/C++ Compiler</a>
+  <div class="texttohide">
+    <p> If the build-essential were already installed in the step before, this step can be skipped.
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install build-essential
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfYASM">
+  <a href="#InstallationOfYASM">Installation of YASM</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install yasm
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+ <div class="textbox" id="InstallationOfPKGConfig">
+  <a href="#InstallationOfPKGConfig">Installation of pkg-config</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install pkg-config
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfwxWidgets">
+  <a href="#InstallationOfwxWidgets">Installation of wxWidgets 3.2</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>		
+				sudo apt update <br>
+				sudo apt install libwxgtk3.0-gtk3-dev <br>
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="InstallationOfFuse">
+  <a href="#InstallationOfFuse">Installation of libfuse</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install libfuse-dev
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+
+<div class="textbox" id="InstallationOfPCSCLite">
+	<a href="#InstallationOfPCSCLite">Installation of libpcsclite</a>
+	<div class="texttohide">
+		<p>
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>
+					sudo apt update <br>
+					sudo apt install libpcsclite-dev
+				</code>
+			</li>
+		</ol>
+		</p>
+	</div>
+</div>
+ 
+ <div class="textbox" id="DownloadVeraCrypt">
+  <a href="#DownloadVeraCrypt">Download VeraCrypt</a>
+  <div class="texttohide">
+    <p>
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>
+				sudo apt update <br>
+				sudo apt install git <br>
+				git clone https://github.com/veracrypt/VeraCrypt.git
+				</code>
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+ <div class="textbox" id="CompileVeraCrypt">
+  <a href="#CompileVeraCrypt">Compile VeraCrypt</a>
+  <div class="texttohide">
+    <p> Remarks: <br>
+	<ul>
+		<li>
+			By default, a universal executable supporting both graphical and text user interface (through the switch --text) is built. <br>
+			On Linux, a console-only executable, which requires no GUI library, can be built using the 'NOGUI' parameter. <br>
+			For that, you need to dowload wxWidgets sources, extract them to a location of your choice and then run the following commands: <br>
+			<code>
+			make NOGUI=1 WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources wxbuild <br>
+			make NOGUI=1 WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources
+			</code>
+		</li>
+		<li>
+			If you are not using the system wxWidgets library, you will have to download and use wxWidgets sources like the remark above but this time the following commands should be run to build GUI version of VeraCrypt (NOGUI is not specified): <br>
+			<code>
+			make WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources wxbuild <br>
+			make WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources
+			</code>
+		</li>
+	</ul>
+	Steps:
+		<ol>
+			<li>
+				Open a terminal
+			</li>
+			<li>
+				Execute the following commands: <br>
+				<code>		
+				cd ~/VeraCrypt/src <br>
+				make
+				</code>
+			</li>
+			<li>
+				If successful, the VeraCrypt executable should be located in the directory 'Main'.
+			</li>
+		</ol>
+	</p>
+  </div>
+ </div>
+ 
+</div>
+</body></html>