macOS: Fix packaging error due to template dmg being too small.

To fix it, we resized the template dmg using hdiutil resize --size 16M

.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!

.github/workflows/build-linux.yml

@@ -0,0 +1,213 @@
+name: Build and test Linux
+
+on:
+  push:
+    branches: [ "master" ]
+    paths:
+      - 'src/Build/Include/Makefile.inc'
+      - 'src/Build/CMakeLists.txt'
+      - 'src/Build/build_cmake_deb.sh'
+      - 'src/Common/*.h'
+      - 'src/Common/*.cpp'
+      - 'src/Common/*.c'
+      - 'src/Core/**'
+      - 'src/Crypto/**'
+      - 'src/Driver/Fuse/**'
+      - 'src/Main/**'
+      - 'src/PKCS11/**'
+      - 'src/Platform/**'
+      - 'src/Resources/**'
+      - 'src/Setup/Linux/**'
+      - 'src/Volume/**'
+      - 'src/Makefile'
+      - '.github/workflows/build-linux.yml'
+  pull_request:
+    branches: [ "master" ]
+    paths:
+      - 'src/Build/Include/Makefile.inc'
+      - 'src/Build/CMakeLists.txt'
+      - 'src/Build/build_cmake_deb.sh'
+      - 'src/Common/*.h'
+      - 'src/Common/*.cpp'
+      - 'src/Common/*.c'
+      - 'src/Core/**'
+      - 'src/Crypto/**'
+      - 'src/Driver/Fuse/**'
+      - 'src/Main/**'
+      - 'src/PKCS11/**'
+      - 'src/Platform/**'
+      - 'src/Resources/**'
+      - 'src/Setup/Linux/**'
+      - 'src/Volume/**'
+      - 'src/Makefile'
+      - '.github/workflows/build-linux.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+env:
+  WXWIDGETS_VERSION: 3.2.5
+
+jobs:
+  ubuntu-build:
+
+    runs-on: ubuntu-22.04
+    timeout-minutes: 30
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    - name: Generate cache key
+      id: cache-key
+      run: |
+        echo "cache_key=$(echo ${{ env.WXWIDGETS_VERSION }}-$(sha256sum src/Makefile .github/workflows/build-linux.yml | awk '{print $1}'))" >> $GITHUB_OUTPUT
+
+    - name: Cache wxBuildConsole
+      uses: actions/cache@v3
+      id: cache-wxbuildconsole
+      with:
+        path: /tmp/wxBuildConsole
+        key: wxBuildConsole-${{ steps.cache-key.outputs.cache_key }}
+
+    - name: Cache wxBuildGUI
+      uses: actions/cache@v3
+      id: cache-wxbuildgui
+      with:
+        path: /tmp/wxBuildGUI
+        key: wxBuildGUI-${{ steps.cache-key.outputs.cache_key }}
+
+    - name: Cache wxWidgets
+      uses: actions/cache@v3
+      id: cache-wxwidgets
+      with:
+        path: /tmp/wxWidgets-${{ env.WXWIDGETS_VERSION }}
+        key: wxWidgets-${{ steps.cache-key.outputs.cache_key }}
+
+    - name: Install dependencies
+      run: sudo apt-get update && sudo apt-get install -y wget tar libpcsclite-dev libfuse-dev yasm libgtk-3-dev libayatana-appindicator3-dev cmake debhelper
+
+    - name: Download and extract wxWidgets to /tmp if build folders are missing
+      if: steps.cache-wxbuildconsole.outputs.cache-hit != 'true' || steps.cache-wxbuildgui.outputs.cache-hit != 'true' || steps.cache-wxwidgets.outputs.cache-hit != 'true'
+      run: |
+        wget https://github.com/wxWidgets/wxWidgets/releases/download/v${{ env.WXWIDGETS_VERSION }}/wxWidgets-${{ env.WXWIDGETS_VERSION }}.tar.bz2 -O /tmp/wxWidgets-${{ env.WXWIDGETS_VERSION }}.tar.bz2
+        mkdir -p /tmp/wxWidgets-${{ env.WXWIDGETS_VERSION }}
+        tar -xjf /tmp/wxWidgets-${{ env.WXWIDGETS_VERSION }}.tar.bz2 -C /tmp/wxWidgets-${{ env.WXWIDGETS_VERSION }} --strip-components=1
+
+    - name: Build VeraCrypt .deb packages
+      run: |
+        chmod +x src/Build/build_cmake_deb.sh
+        src/Build/build_cmake_deb.sh WXSTATIC INDICATOR
+
+    - name: Upload GUI .deb packages
+      uses: actions/upload-artifact@v3
+      with:
+        name: veracrypt-gui-debs
+        path: /tmp/VeraCrypt_Packaging/GUI/Packaging/veracrypt-*.*
+
+    - name: Upload Console .deb packages
+      uses: actions/upload-artifact@v3
+      with:
+        name: veracrypt-console-debs
+        path: /tmp/VeraCrypt_Packaging/Console/Packaging/veracrypt-console-*.*
+
+    - name: Install and test VeraCrypt GUI .deb packages
+      run: |
+        sudo apt install -y /tmp/VeraCrypt_Packaging/GUI/Packaging/veracrypt-*.deb
+        veracrypt --text --test && veracrypt --text --version
+        sudo veracrypt --text --non-interactive Tests/test.sha256.hc --hash sha256 --slot 1 --password test --mount-options=ro
+        sudo veracrypt --text --non-interactive Tests/test.sha512.hc --hash sha512 --slot 2 --password test --mount-options=ro
+        sudo veracrypt --text --non-interactive Tests/test.streebog.hc --hash streebog --slot 3 --password test --mount-options=ro
+        sudo veracrypt --text --non-interactive Tests/test.whirlpool.hc --hash whirlpool --slot 4 --password test --mount-options=ro
+        sudo veracrypt --text --list
+        echo -n "Dummy" > /tmp/expected_content.txt
+        if cmp -s /media/veracrypt1/Dummy.txt /tmp/expected_content.txt; then
+          echo "Content of test.sha256.hc is valid."
+        else
+          echo "Content of test.sha256.hc is invalid!"
+          exit 1
+        fi
+        if cmp -s /media/veracrypt2/Dummy.txt /tmp/expected_content.txt; then
+          echo "Content of test.sha512.hc is valid."
+        else
+          echo "Content of test.sha512.hc is invalid!"
+          exit 1
+        fi
+        if cmp -s /media/veracrypt3/Dummy.txt /tmp/expected_content.txt; then
+          echo "Content of test.streebog.hc is valid."
+        else
+          echo "Content of test.streebog.hc is invalid!"
+          exit 1
+        fi
+        if cmp -s /media/veracrypt4/Dummy.txt /tmp/expected_content.txt; then
+          echo "Content of test.whirlpool.hc is valid."
+        else
+          echo "Content of test.whirlpool.hc is invalid!"
+          exit 1
+        fi
+        sudo veracrypt -d
+        sudo apt remove -y veracrypt
+
+    - name: Install and test VeraCrypt Console .deb packages
+      run: |
+        sudo apt install -y /tmp/VeraCrypt_Packaging/Console/Packaging/veracrypt-console-*.deb
+        veracrypt --test && veracrypt --version
+        sudo veracrypt --non-interactive Tests/test.sha256.hc --hash sha256 --slot 1 --password test --mount-options=ro
+        sudo veracrypt --non-interactive Tests/test.sha512.hc --hash sha512 --slot 2 --password test --mount-options=ro
+        sudo veracrypt --non-interactive Tests/test.streebog.hc --hash streebog --slot 3 --password test --mount-options=ro
+        sudo veracrypt --non-interactive Tests/test.whirlpool.hc --hash whirlpool --slot 4 --password test --mount-options=ro
+        sudo veracrypt --list
+        echo -n "Dummy" > /tmp/expected_content.txt
+        if cmp -s /media/veracrypt1/dummy.txt /tmp/expected_content.txt; then
+          echo "Content of test.sha256.hc is valid."
+        else
+          echo "Content of test.sha256.hc is invalid!"
+          exit 1
+        fi
+        if cmp -s /media/veracrypt2/dummy.txt /tmp/expected_content.txt; then
+          echo "Content of test.sha512.hc is valid."
+        else
+          echo "Content of test.sha512.hc is invalid!"
+          exit 1
+        fi
+        if cmp -s /media/veracrypt3/dummy.txt /tmp/expected_content.txt; then
+          echo "Content of test.streebog.hc is valid."
+        else
+          echo "Content of test.streebog.hc is invalid!"
+          exit 1
+        fi
+        if cmp -s /media/veracrypt4/dummy.txt /tmp/expected_content.txt; then
+          echo "Content of test.whirlpool.hc is valid."
+        else
+          echo "Content of test.whirlpool.hc is invalid!"
+          exit 1
+        fi
+        sudo veracrypt -d
+        sudo apt remove -y veracrypt-console
+
+    - name: Cleanup old caches
+      uses: actions/github-script@v6
+      if: always()
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        script: |
+          const caches = await github.rest.actions.getActionsCacheList({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+          })
+          for (const cache of caches.data.actions_caches) {
+            if (cache.key.startsWith('wxBuildConsole-') || cache.key.startsWith('wxBuildGUI-') || cache.key.startsWith('wxWidgets-')) {
+              if (cache.key !== `wxBuildConsole-${{ steps.cache-key.outputs.cache_key }}` &&
+                  cache.key !== `wxBuildGUI-${{ steps.cache-key.outputs.cache_key }}` &&
+                  cache.key !== `wxWidgets-${{ steps.cache-key.outputs.cache_key }}`) {
+                console.log(`Deleting cache with key: ${cache.key}`)
+                await github.rest.actions.deleteActionsCacheById({
+                  owner: context.repo.owner,
+                  repo: context.repo.repo,
+                  cache_id: cache.id,
+                })
+              }
+            }
+          }
+

.github/workflows/xmlvalidate.sh

@@ -0,0 +1,42 @@
+#!/bin/bash
+fail=false
+
+# Get all string keys
+KEYS=$(grep -oP '<entry[\ ]+lang="[^"]+"[\ ]+key="\K[^"]+' "$1"/src/Common/Language.xml)
+
+for file in {"$1"/Translations/Language.*.xml,"$1"/src/Common/Language.xml}; do
+  echo "$file"
+  passes=true
+  
+  # Validate xml
+  output=$(fxparser -V "$file")
+  returnvalue=$?
+
+  if [ "$returnvalue" -ne "0" ]; then
+    passes=false
+    fail=true
+    echo $output
+  fi
+
+  # Ensure each key found in common xml is found in translation xmls
+  for key in $KEYS; do
+    if ! grep -q "$key" "$file"; then
+      echo "Key $key not found in $file"
+      passes=false
+      fail=true
+    fi
+  done
+  
+  if [ "$passes" = true ]; then
+    echo -e "\e[32m$file passes xml validation.\e[0m"
+  else
+    echo -e "\e[31m$file fails xml validation.\e[0m"
+  fi
+  
+done
+
+if [ "$fail" = true ]; then
+  exit 1
+else
+  exit 0
+fi

.github/workflows/xmlvalidate.yml

@@ -0,0 +1,36 @@
+name: Validate XML
+
+on:
+  push:
+    branches: [ "ci" ]
+    paths:
+      - 'Translations/*'
+      - 'src/Common/Language.xml'
+      - '.github/workflows/xmlvalidate.*'
+  pull_request:
+    branches: [ "ci" ]
+    paths:
+      - 'Translations/*'
+      - 'src/Common/Language.xml'
+      - '.github/workflows/xmlvalidate.*'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  validate:
+
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Setup Node.js
+      uses: actions/setup-node@v4
+      with:
+        node-version: 'latest'
+    - name: Install fast-xml-parser
+      run: npm install fast-xml-parser -g
+    - name: Run XML validator script
+      run: ${{ github.workspace }}/.github/workflows/xmlvalidate.sh "${{ github.workspace }}"

.gitignore

@@ -0,0 +1,112 @@
+# 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
+*.oshani
+*.oarmv8crypto
+
+# 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

@@ -679,7 +679,7 @@ warranties in respect of its properties, including, but not
 limited to, correctness and/or fitness for purpose.
 ____________________________________________________________
 
-Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
+Copyright (C) 1995-2023 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages
@@ -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-2023 Dieter Baron and Thomas Klausner
 
 The authors can be contacted at <libzip@nih.at>
 
@@ -742,3 +742,80 @@ 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-2019 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.
+____________________________________________________________
+Copyright (c) 1999-2023 Igor Pavlov
+
+LZMA SDK is written and placed in the public domain by Igor Pavlov.
+
+Some code in LZMA SDK is based on public domain code from another developers:
+  1) PPMd var.H (2001): Dmitry Shkarin
+  2) SHA-256: Wei Dai (Crypto++ library)
+
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute the 
+original LZMA SDK code, either in source code form or as a compiled binary, for 
+any purpose, commercial or non-commercial, and by any means.
+____________________________________________________________

README.md

@@ -1,9 +1,7 @@
 This archive contains the source code of VeraCrypt.
-It is based on original TrueCrypt 7.1a with security enhancements and modifications.
+It is based on the original TrueCrypt 7.1a with security enhancements and modifications.
 
-
+# Important
-Important
-=========
 
 You may use the source code contained in this archive only if you accept and
 agree to the license terms contained in the file 'License.txt', which is
@@ -12,155 +10,113 @@ included in this archive.
 Note that the license specifies, for example, that a derived work must not be
 called 'TrueCrypt' or 'VeraCrypt'
 
+# Contents
 
+[I. Windows](#i-windows)
 
-Contents
+[II. Linux and Mac OS X](#ii-linux-and-mac-os-x)
-========
 
-I. Windows
+[III. FreeBSD](#iii-freebsd)
-   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
+[IV. Third-Party Developers (Contributors)](#iv-third-party-developers-contributors)
-    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
+[V. Legal Information](#v-legal-information)
 
-IV. Third-Party Developers (Contributors)
+[VI. Further Information](#vi-further-information)
 
-V. Legal Information
+# I. Windows
 
-VI. Further Information
+## Requirements for Building VeraCrypt for Windows:
 
-
+A detailed guide on how to build VeraCrypt on Windows can be found in
-
+the [documentation](./doc/html/CompilingGuidelineWin.html) in the repository and
-I. Windows
+it is also available [online](https://www.veracrypt.fr/en/CompilingGuidelineWin.html).
-==========
-
-Requirements for Building VeraCrypt for Windows:
-------------------------------------------------
-
-- Microsoft Visual C++ 2010 SP1 (Professional Edition or compatible)
-- Microsoft Visual C++ 1.52 (available from MSDN Subscriber Downloads)
-- Microsoft Windows SDK for Windows 7.1 (configured for Visual C++ 2010)
-- 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:
 
 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
+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
-and compare your binaries with the official binaries. If your binaries are
-unsigned, the sizes of the official binaries will usually be approximately
-10 KB greater than sizes of your binaries (there may be further differences
-if you use a different version of the compiler, or if you install a different
-or no service pack for Visual Studio, or different hotfixes for it, or if you
-use different versions of the required SDKs).
 
+Keep this in mind if you compile VeraCrypt and compare your binaries with the
+official binaries. If your binaries are unsigned, the sizes of the official
+binaries will usually be approximately 10 KiB greater than the sizes of your
+binaries (there may be further differences if you use a different version of
+the compiler, or if you install a different or no service pack for Visual
+Studio, or different hotfixes for it, or if you use different versions of
+the required SDKs).
 
-Instructions for Building VeraCrypt for Windows:
+## Instructions for Signing and Packaging 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:
--------------------------------------------------------------
 
 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 build the final installation setup and MSI package.
-The batch file suppose that the code signing certificate is issued by Thawt.
+The batch file assumes 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.
 
-VeraCrypt EFI Boot Loader:
+To generate MSI packages, WiX Toolset v3.11 must be installed.
---------------------------
+
+## VeraCrypt EFI Boot Loader:
 
 VeraCrypt source code contains pre-built EFI binaries under src\Boot\EFI.
-The source code of VeraCrypt EFI Boot Loader is licensed under LGPL and 
+The source code of VeraCrypt EFI Boot Loader is licensed under LGPL and
 it is available at https://github.com/veracrypt/VeraCrypt-DCS.
 For build instructions, please refer to the file src\Boot\EFI\Readme.txt.
 
+# II. Linux and Mac OS X
 
-II. Linux and Mac OS X
+A detailed guide on how to build VeraCrypt on Linux can be found in
-======================
+the [documentation](./doc/html/CompilingGuidelineLinux.html) in the repository and
+it is also available [online](https://www.veracrypt.fr/en/CompilingGuidelineLinux.html).
 
-Requirements for Building VeraCrypt for Linux and Mac OS X:
+## Requirements for Building VeraCrypt for Linux and Mac OS X:
------------------------------------------------------------
 
 - GNU Make
 - GNU C++ Compiler 4.0 or compatible
-- Apple Xcode (Mac OS X only)
+- Apple Xcode or Xcode command line tools (Mac OS X only)
 - YASM 1.3.0 or newer (Linux only, x86/x64 architecture only)
 - pkg-config
 - wxWidgets 3.0 shared library and header files installed or
   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:
 
-Instructions for Building VeraCrypt for Linux and Mac OS X:
+1. Change the current directory to the root of the VeraCrypt source code.
------------------------------------------------------------
 
-1) Change the current directory to the root of the VeraCrypt source code.
+2. If you have no wxWidgets shared library installed, run the following
-
-2) If you have no wxWidgets shared library installed, run the following
    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
+   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/'
    directory.
 
-3) To build VeraCrypt, run the following command:
+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
+4. If successful, the VeraCrypt executable should be located in the directory
    'Main'.
 
 By default, a universal executable supporting both graphical and text user
@@ -168,104 +124,112 @@ 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:
+## Mac OS X specifics:
------------------------------------------------------------
 
-Under MacOSX, the SDK for OSX 10.7 is used by default. To use another version
+Under MacOSX, the latest installed SDK is used by default. To use a different version
-of the SDK (i.e. 10.6), you can export the environment variable VC_OSX_TARGET:
+of the SDK when building using make, you can export the environment variable VC_OSX_SDK:
 
-	$ export VC_OSX_TARGET=10.6
+`$ export VC_OSX_SDK=13.0`
 
+For development dependencies management, you can use [homebrew](https://brew.sh).
 
-Before building under MacOSX, pkg-config must be installed if not yet available.
+`$ brew install pkg-config yasm wxwidgets`
-Get it from https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz and
-compile using the following commands :
 
-	$ ./configure --with-internal-glib
+You also need system dependencies
-	$ make
+
-	$ sudo make install
+`$ brew install --cask macfuse packages`
+
+After installing dependencies via brew, you can build a local development build
+
+`$ ./src/Build/build_veracrypt_macosx.sh -b`
+
+If you want to build the package, you must pass `-p` to the build script above. The built
+executable will be in `.src/Main`
+
+If you prefer to build from sources, or without homebrew, pkg-config and packages must be installed.
+
+Get pkg-config from https://pkgconfig.freedesktop.org/releases/pkg-config-0.29.2.tar.gz and
+compile using the following commands:
+
+`$ CFLAGS="-Wno-int-conversion" CXXFLAGS="-Wno-int-conversion" ./configure --with-internal-glib`
+
+`$ make`
+
+`$ 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
+The [build_veracrypt_macosx.sh](./src/Build/build_veracrypt_macosx.sh) script 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.2.5 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.2.5")
 
-The build process uses Code Signing certificates whose ID is specified in
+The make build process uses Code Signing certificates whose ID is specified in
-src/Main/Main.make (look for lines containing "Developer ID Application" and 
+src/Main/Main.make (look for lines containing "Developer ID Application" and
 "Developer ID Installer"). You'll have to modify these lines to put the ID of
-your Code Signing certificates or comment them if you don't have one.
+your Code Signing certificates or comment them out if you don't have one.
 
 Because of incompatibility issues with OSXFUSE, the SDK 10.9 generates a
 VeraCrypt binary that has issues communicating with the OSXFUSE kernel extension.
 Thus, we recommend using a different OSX SDK version for building VeraCrypt.
 
+The Packages installer that is used for the VeraCrypt official build has been notarized by IDRIX and it is available at
+https://github.com/idrassi/packages/releases
 
-
+# III. FreeBSD
-III. FreeBSD
-============================
 
 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.
 
-
+# IV. Third-Party Developers (Contributors)
-
-IV. Third-Party Developers (Contributors)
-=========================================
 
 If you intend to implement a feature, please contact us first to make sure:
 
-1) That the feature has not been implemented (we may have already implemented
+1. That the feature has not been implemented (we may have already implemented
    it, but haven't released the code yet).
-2) That the feature is acceptable.
+2. That the feature is acceptable.
-3) Whether we need help of third-party developers with implementing the feature.
+3. Whether we need the help of third-party developers with implementing the feature.
 
 Information on how to contact us can be found at:
 https://www.veracrypt.fr/
 
+# V. Legal Information
 
+## Copyright Information
 
-V. Legal Information
+This software as a whole:  
-====================
+Copyright (c) 2013-2024 IDRIX. All rights reserved.  
 
-Copyright Information
+Portions of this software:  
----------------------
+Copyright (c) 2013-2024 IDRIX. All rights reserved.  
-
+Copyright (c) 2003-2012 TrueCrypt Developers Association. All rights reserved.  
-This software as a whole:
+Copyright (c) 1998-2000 Paul Le Roux. All rights reserved.  
-Copyright (c) 2013-2017 IDRIX. All rights reserved.
+Copyright (c) 1998-2008 Brian Gladman, Worcester, UK. All rights reserved.  
-
+Copyright (c) 1995-2023 Jean-loup Gailly and Mark Adler.  
-Portions of this software:
+Copyright (c) 2016 Disk Cryptography Services for EFI (DCS), Alex Kolotnikov  
-Copyright (c) 2013-2017 IDRIX. All rights reserved.
+Copyright (c) 1999-2023 Dieter Baron and Thomas Klausner.  
-Copyright (c) 2003-2012 TrueCrypt Developers Association. All rights reserved.
+Copyright (c) 2013, Alexey Degtyarev. All rights reserved.  
-Copyright (c) 1998-2000 Paul Le Roux. All rights reserved.
+Copyright (c) 1999-2016 Jack Lloyd. All rights reserved.  
-Copyright (c) 1998-2008 Brian Gladman, Worcester, UK. All rights reserved.
+Copyright (c) 2013-2019 Stephan Mueller <smueller@chronox.de>  
-Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler.
+Copyright (c) 1999-2023 Igor Pavlov  
-Copyright (c) 2016 Disk Cryptography Services for EFI (DCS), Alex Kolotnikov
-Copyright (c) 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.
 
 For more information, please see the legal notices attached to parts of the
 source code.
 
-Trademark Information
+## Trademark Information
----------------------
 
 Any trademarks contained in the source code, binaries, and/or in the
 documentation, are the sole property of their respective owners.
 
-
+# VI. Further Information
-
-VI. Further Information
-=======================
 
 https://www.veracrypt.fr

Tests/bench.bat

@@ -1,331 +1,90 @@
 @echo off
+setlocal EnableDelayedExpansion
 
-setlocal
+:: Define constants
+set "VERACRYPT_PATH=c:\Program Files\VeraCrypt\veracrypt.exe"
+set "PASSWORD=test"
+set "HIDDEN_PASSWORD=testhidden"
 
-call :freedrive mydriveletter && goto :cont
+:: Find a free drive letter
-echo ERROR: No free drive letter found.
+call :freedrive mydriveletter || (
+    echo ERROR: No free drive letter found.
+    goto :exit
+)
+
+echo Using drive letter !mydriveletter!: for our tests
+echo.
+
+:: Define an array of hash algorithms and their corresponding container files
+set "algorithms[0]=sha512,test.sha512.hc"
+set "algorithms[1]=whirlpool,test.whirlpool.hc"
+set "algorithms[2]=sha256,test.sha256.hc"
+set "algorithms[3]=blake2s,test.blake2s.hc"
+set "algorithms[4]=streebog,test.streebog.hc"
+
+:: Loop through each algorithm
+for /L %%i in (0,1,4) do (
+    for /F "tokens=1,2 delims=," %%a in ("!algorithms[%%i]!") do (
+        set "hash=%%a"
+        set "container=%%b"
+        
+        if exist "!container!" (
+            call :mount_and_measure "!hash!" "!container!" "Normal" "!PASSWORD!"
+            call :mount_and_measure "!hash!" "!container!" "Hidden" "!HIDDEN_PASSWORD!"
+            echo.
+        )
+    )
+)
+
+:: Autodetect test
+call :availablevolume testvolume || goto :exit
+
+call :measure_time "Wrong Password (PRF Auto-detection)" ^
+    "/volume !testvolume! /l !mydriveletter! /password wrongpassword /q /silent /m ro"
+
+echo.
 goto :exit
-:cont
 
-echo Using drive letter %mydriveletter%: for our tests
+:: Subroutine to mount a volume and measure the time taken
-echo.
+:mount_and_measure
+setlocal 
+set "hash=%~1"
+set "container=%~2"
+set "type=%~3"
+set "volumepassword=%~4"
 
-IF NOT EXIST test.sha512.hc GOTO :whirlpool
+call :measure_time "%hash% (%type%)" ^
+    "/volume !container! /hash !hash! /l !mydriveletter! /password !volumepassword! /q /silent /m ro"
 
-rem Get start time:
+if not exist !mydriveletter!:\ (
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
+    echo ERROR: Drive letter !mydriveletter!: does not exist after mount operation.
-   set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
+    goto :exit
 )
 
-rem Mount SHA-512 container (Normal)
+"!VERACRYPT_PATH!" /dismount !mydriveletter! /silent /q
-"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.sha512.hc /hash sha512 /l %mydriveletter% /password test /q /silent /m ro
+exit /b
 
-rem Get end time:
+:: Subroutine to measure the time taken for a command to execute
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
+:measure_time
-   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
+setlocal 
-)
+set "oper=%~1"
+set "command=%~2"
+
+for /F "tokens=1-4 delims=:.," %%a in ("!time!") do set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
+
+"!VERACRYPT_PATH!" %command%
+
+for /F "tokens=1-4 delims=:.," %%a in ("!time!") do set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
 
-rem Get elapsed time:
 set /A elapsed=end-start
-
-rem Show elapsed time:
 set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
 if %hh% lss 10 set hh=0%hh%
 if %mm% lss 10 set mm=0%mm%
 if %ss% lss 10 set ss=0%ss%
 if %cc% lss 10 set cc=0%cc%
-echo SHA-512 (Normal) = %hh%:%mm%:%ss%,%cc%
 
-"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
+echo %oper% = %hh%:%mm%:%ss%,%cc%
-
+exit /b
-rem Get start time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Mount SHA-512 container (Hidden)
-"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.sha512.hc /hash sha512 /l %mydriveletter% /password testhidden /q /silent /m ro
-
-rem Get end time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Get elapsed time:
-set /A elapsed=end-start
-
-rem Show elapsed time:
-set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
-if %hh% lss 10 set hh=0%hh%
-if %mm% lss 10 set mm=0%mm%
-if %ss% lss 10 set ss=0%ss%
-if %cc% lss 10 set cc=0%cc%
-echo SHA-512 (Hidden) = %hh%:%mm%:%ss%,%cc%
-echo.
-
-"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
-
-:whirlpool
-
-IF NOT EXIST test.whirlpool.hc GOTO :sha256
-
-rem Get start time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Mount Whirlpool container (Normal).
-"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.whirlpool.hc /hash whirlpool /l %mydriveletter% /password test /q /silent /m ro
-
-rem Get end time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Get elapsed time:
-set /A elapsed=end-start
-
-rem Show elapsed time:
-set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
-if %hh% lss 10 set hh=0%hh%
-if %mm% lss 10 set mm=0%mm%
-if %ss% lss 10 set ss=0%ss%
-if %cc% lss 10 set cc=0%cc%
-echo Whirlpool (Normal) = %hh%:%mm%:%ss%,%cc%
-
-"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
-
-rem Get start time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Mount Whirlpool container (Hidden).
-"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.whirlpool.hc /hash whirlpool /l %mydriveletter% /password testhidden /q /silent /m ro
-
-rem Get end time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Get elapsed time:
-set /A elapsed=end-start
-
-rem Show elapsed time:
-set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
-if %hh% lss 10 set hh=0%hh%
-if %mm% lss 10 set mm=0%mm%
-if %ss% lss 10 set ss=0%ss%
-if %cc% lss 10 set cc=0%cc%
-echo Whirlpool (Hidden) = %hh%:%mm%:%ss%,%cc%
-echo.
-
-"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
-
-:sha256
-
-IF NOT EXIST test.sha256.hc GOTO :ripemd160
-
-rem Get start time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Mount SHA-256 container (Normal)
-"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.sha256.hc /hash sha256 /l %mydriveletter% /password test /q /silent /m ro
-
-rem Get end time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Get elapsed time:
-set /A elapsed=end-start
-
-rem Show elapsed time:
-set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
-if %hh% lss 10 set hh=0%hh%
-if %mm% lss 10 set mm=0%mm%
-if %ss% lss 10 set ss=0%ss%
-if %cc% lss 10 set cc=0%cc%
-echo SHA-256 (Normal) = %hh%:%mm%:%ss%,%cc%
-
-"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
-
-rem Get start time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Mount SHA-256 container (Hidden)
-"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.sha256.hc /hash sha256 /l %mydriveletter% /password testhidden /q /silent /m ro
-
-rem Get end time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Get elapsed time:
-set /A elapsed=end-start
-
-rem Show elapsed time:
-set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
-if %hh% lss 10 set hh=0%hh%
-if %mm% lss 10 set mm=0%mm%
-if %ss% lss 10 set ss=0%ss%
-if %cc% lss 10 set cc=0%cc%
-echo SHA-256 (Hidden) = %hh%:%mm%:%ss%,%cc%
-echo.
-
-"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
-
-:ripemd160
-
-IF NOT EXIST test.ripemd160.hc GOTO :streebog
-
-rem Get start time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Mount RIPEMD-160 container (Normal)
-"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.ripemd160.hc /hash ripemd160 /l %mydriveletter% /password test /q /silent /m ro
-
-rem Get end time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Get elapsed time:
-set /A elapsed=end-start
-
-rem Show elapsed time:
-set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
-if %hh% lss 10 set hh=0%hh%
-if %mm% lss 10 set mm=0%mm%
-if %ss% lss 10 set ss=0%ss%
-if %cc% lss 10 set cc=0%cc%
-echo RIPEMD-160 (Normal) = %hh%:%mm%:%ss%,%cc%
-
-"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
-
-rem Get start time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Mount RIPEMD-160 container (Hidden)
-"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.ripemd160.hc /hash ripemd160 /l %mydriveletter% /password testhidden /q /silent /m ro
-
-rem Get end time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Get elapsed time:
-set /A elapsed=end-start
-
-rem Show elapsed time:
-set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
-if %hh% lss 10 set hh=0%hh%
-if %mm% lss 10 set mm=0%mm%
-if %ss% lss 10 set ss=0%ss%
-if %cc% lss 10 set cc=0%cc%
-echo RIPEMD-160 (Hidden) = %hh%:%mm%:%ss%,%cc%
-echo.
-
-"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
-
-:streebog
-
-IF NOT EXIST test.streebog.hc GOTO :autodetect
-
-rem Get start time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Mount Streebog container (Normal)
-"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.streebog.hc /hash streebog /l %mydriveletter% /password test /q /silent /m ro
-
-rem Get end time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Get elapsed time:
-set /A elapsed=end-start
-
-rem Show elapsed time:
-set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
-if %hh% lss 10 set hh=0%hh%
-if %mm% lss 10 set mm=0%mm%
-if %ss% lss 10 set ss=0%ss%
-if %cc% lss 10 set cc=0%cc%
-echo Streebog (Normal) = %hh%:%mm%:%ss%,%cc%
-
-"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
-
-rem Get start time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Mount Streebog container (Hidden)
-"c:\Program Files\VeraCrypt\veracrypt.exe" /volume test.streebog.hc /hash streebog /l %mydriveletter% /password testhidden /q /silent /m ro
-
-rem Get end time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Get elapsed time:
-set /A elapsed=end-start
-
-rem Show elapsed time:
-set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
-if %hh% lss 10 set hh=0%hh%
-if %mm% lss 10 set mm=0%mm%
-if %ss% lss 10 set ss=0%ss%
-if %cc% lss 10 set cc=0%cc%
-echo Streebog (Hidden) = %hh%:%mm%:%ss%,%cc%
-echo.
-
-"c:\Program Files\VeraCrypt\veracrypt.exe" /dismount %mydriveletter% /silent /q
-
-:autodetect
-
-call :availablevolume testvolume && goto :contautodetect
-goto :exit
-:contautodetect
-
-rem Get start time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "start=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Try to mount with a wrong password and PRF autodetection
-"c:\Program Files\VeraCrypt\veracrypt.exe" /volume %testvolume% /l %mydriveletter% /password wrongpassword /q /silent /m ro
-
-rem Get end time:
-for /F "tokens=1-4 delims=:.," %%a in ("%time%") do (
-   set /A "end=(((%%a*60)+1%%b %% 100)*60+1%%c %% 100)*100+1%%d %% 100"
-)
-
-rem Get elapsed time:
-set /A elapsed=end-start
-
-rem Show elapsed time:
-set /A hh=elapsed/(60*60*100), rest=elapsed%%(60*60*100), mm=rest/(60*100), rest%%=60*100, ss=rest/100, cc=rest%%100
-if %hh% lss 10 set hh=0%hh%
-if %mm% lss 10 set mm=0%mm%
-if %ss% lss 10 set ss=0%ss%
-if %cc% lss 10 set cc=0%cc%
-echo Wrong Password (PRF Auto-detection)= %hh%:%mm%:%ss%,%cc%
-echo.
-
-
-goto :exit
 
 rem Finds a free drive letter.
 rem
@@ -360,11 +119,12 @@ set drive=
 :freedrive0
 endlocal & set "%output_var%=%drive%" & exit /b %exitcode%
 
+:: Subroutine to find an available volume
 :availablevolume
 setlocal EnableDelayedExpansion
 set exitcode=0
 set "output_var=%~1"
-for %%i in (test.sha512.hc,test.sha256.hc,test.whirlpool.hc,test.ripemd160.hc) do (
+for %%i in (test.sha512.hc,test.sha256.hc,test.whirlpool.hc,test.blake2s.hc) do (
     if exist %%i (
         set "volume=%%i"
         goto :availablevolume0

contrib/EncryptData.ps1

@@ -0,0 +1,278 @@
+<#
+.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: 26 July 2024
+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
+$BackupVBRSize = 32KB
+$InitialFATSize = 128KB
+$ClusterSize = 32KB # TODO : make this configurable
+$UpCaseTableSize = 128KB # Typical size
+
+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 + $BackupVBRSize + $InitialFATSize + $UpCaseTableSize
+
+        # 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 = [math]::Ceiling($totalSize / $ClusterSize)
+        $bitmapSize = [math]::Ceiling($numClusters / 8)
+        $totalSize += $bitmapSize
+
+        # Adjust the size of the FAT
+        $fatSize = $numClusters * 4
+        $totalSize += $fatSize - $InitialFATSize
+		
+        # Add safety factor to account for potential filesystem overhead
+        # For smaller datasets (<100MB), we add 1% or 64KB (whichever is larger)
+        # For larger datasets (>=100MB), we add 0.1% or 1MB (whichever is larger)
+        # This scaled approach ensures adequate extra space without excessive overhead
+        $safetyFactor = if ($totalSize -lt 100MB) {
+            [math]::Max(64KB, $totalSize * 0.01)
+        } else {
+            [math]::Max(1MB, $totalSize * 0.001)
+        }
+        $totalSize += $safetyFactor
+
+        # 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
+
+# Convert to MB and round up to the nearest MB
+$containerSize = [math]::Ceiling($containerSize / 1MB)
+
+# Add extra space for VeraCrypt headers, reserved areas, and potential alignment requirements
+# We use a sliding scale to balance efficiency for small datasets and adequacy for large ones:
+# - For very small datasets (<10MB), add 1MB
+# - For small to medium datasets (10-100MB), add 2MB
+# - For larger datasets (>100MB), add 1% of the total size
+# This approach ensures sufficient space across a wide range of dataset sizes
+if ($containerSize -lt 10) {
+    $containerSize += 1  # Add 1 MB for very small datasets
+} elseif ($containerSize -lt 100) {
+    $containerSize += 2  # Add 2 MB for small datasets
+} else {
+    $containerSize += [math]::Ceiling($containerSize * 0.01)  # Add 1% for larger datasets
+}
+
+# Ensure a minimum container size of 2 MB
+$containerSize = [math]::Max(2, $containerSize)
+
+# 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">
@@ -131,6 +139,10 @@
 		<param name="Name" value="Converting TrueCrypt Volumes &amp; Partitions">
 		<param name="Local" value="Converting TrueCrypt volumes and partitions.html">
 		</OBJECT>
+	<LI> <OBJECT type="text/sitemap">
+		<param name="Name" value="Conversion Guide for Versions 1.26 and Later">
+		<param name="Local" value="Conversion_Guide_VeraCrypt_1.26_and_Later.html">
+		</OBJECT>
 	<LI> <OBJECT type="text/sitemap">
 		<param name="Name" value="Default Mount Parameters">
 		<param name="Local" value="Default Mount Parameters.html">
@@ -175,8 +187,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">
@@ -234,6 +246,14 @@
 			<param name="Name" value="Unencrypted Data in RAM">
 			<param name="Local" value="Unencrypted Data in RAM.html">
 			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="VeraCrypt RAM Encryption">
+			<param name="Local" value="VeraCrypt RAM Encryption.html">
+			</OBJECT>
+		<LI> <OBJECT type="text/sitemap">
+			<param name="Name" value="VeraCrypt Memory Protection">
+			<param name="Local" value="VeraCrypt Memory Protection.html">
+			</OBJECT>
 		<LI> <OBJECT type="text/sitemap">
 			<param name="Name" value="Physical Security">
 			<param name="Local" value="Physical Security.html">
@@ -390,6 +410,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_30x30.png
 Beginner's Tutorial.html
 Beginner's Tutorial_Image_001.jpg
 Beginner's Tutorial_Image_002.jpg
@@ -42,13 +45,18 @@ 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
+Conversion_Guide_VeraCrypt_1.26_and_Later.html
 Converting TrueCrypt volumes and partitions.html
 Converting TrueCrypt volumes and partitions_truecrypt_convertion.jpg
 Creating New Volumes.html
@@ -60,12 +68,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 +93,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 +108,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 +147,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
@@ -161,6 +176,8 @@ Using VeraCrypt Without Administrator Privileges.html
 VeraCrypt Background Task.html
 VeraCrypt Hidden Operating System.html
 VeraCrypt License.html
+VeraCrypt Memory Protection.html
+VeraCrypt RAM Encryption.html
 VeraCrypt Rescue Disk.html
 VeraCrypt System Files.html
 VeraCrypt Volume Format Specification.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

@@ -10,8 +10,8 @@
 </head>
 <body>
 
-<div>                      
+<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">
@@ -27,7 +27,7 @@
 
 <div>
 <p>
-<a href="Documentation.html">Documentation</a>           
+<a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Encryption%20Algorithms.html">Encryption Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
@@ -48,4 +48,4 @@ In June 2003, after the NSA (US National Security Agency) conducted a review and
  associated with the protection of national security systems and/or national security information [1].</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <a href="Camellia.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>
+</div><div class="ClearBoth"></div></body></html>

doc/html/Acknowledgements.html

@@ -10,8 +10,8 @@
 </head>
 <body>
 
-<div>                      
+<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">
@@ -27,7 +27,7 @@
 
 <div>
 <p>
-<a href="Documentation.html">Documentation</a>           
+<a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Acknowledgements.html">Acknowledgements</a>
 </p></div>

doc/html/Additional Security Requirements and Precautions.html

@@ -10,8 +10,8 @@
 </head>
 <body>
 
-<div>                      
+<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">
@@ -27,7 +27,7 @@
 
 <div>
 <p>
-<a href="Documentation.html">Documentation</a>           
+<a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
@@ -49,4 +49,4 @@
 <p>See also: <a href="Digital%20Signatures.html">
 <em>Digital Signatures</em></a></p>
 </div>
-</div><div class="ClearBoth"></div></body></html>
+</div><div class="ClearBoth"></div></body></html>

doc/html/Authenticity and Integrity.html

@@ -10,8 +10,8 @@
 </head>
 <body>
 
-<div>                      
+<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">
@@ -27,7 +27,7 @@
 
 <div>
 <p>
-<a href="Documentation.html">Documentation</a>           
+<a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
@@ -46,4 +46,4 @@ See also: <a href="Physical%20Security.html">
 <em>Physical Security</em></a>, <a href="Security%20Model.html">
 <em>Security Model</em></a></p>
 </div>
-</div><div class="ClearBoth"></div></body></html>
+</div><div class="ClearBoth"></div></body></html>

doc/html/Authors.html

@@ -10,8 +10,8 @@
 </head>
 <body>
 
-<div>                      
+<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">
@@ -27,7 +27,7 @@
 
 <div>
 <p>
-<a href="Documentation.html">Documentation</a>           
+<a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="VeraCrypt%20Volume.html">VeraCrypt Volume</a>
 </p></div>
@@ -39,4 +39,4 @@ https://fr.linkedin.com/in/idrassi</a>) is the creator and main developer of Ver
 <p>Alex Kolotnikov (<a href="https://ru.linkedin.com/in/alex-kolotnikov-6625568b" target="_blank">https://ru.linkedin.com/in/alex-kolotnikov-6625568b</a>) is the author of VeraCrypt EFI bootloader. He manages all aspects of EFI support and his strong expertise
  helps bring new exciting features to VeraCrypt Windows system encryption.</p>
 <p>&nbsp;</p>
-</div><div class="ClearBoth"></div></body></html>
+</div><div class="ClearBoth"></div></body></html>

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

@@ -10,8 +10,8 @@
 </head>
 <body>
 
-<div>                      
+<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">
@@ -27,19 +27,25 @@
 
 <div>
 <p>
-<a href="Documentation.html">Documentation</a>           
+<a href="Documentation.html">Documentation</a>
 <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>
+</div><div class="ClearBoth"></div></body></html>

doc/html/Beginner's Tutorial.html

@@ -10,8 +10,8 @@
 </head>
 <body>
 
-<div>                      
+<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">
@@ -27,7 +27,7 @@
 
 <div>
 <p>
-<a href="Documentation.html">Documentation</a>           
+<a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Beginner's%20Tutorial.html">Beginner's Tutorial</a>
 </p></div>
@@ -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

@@ -10,8 +10,8 @@
 </head>
 <body>
 
-<div>                      
+<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">
@@ -27,7 +27,7 @@
 
 <div>
 <p>
-<a href="Documentation.html">Documentation</a>           
+<a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Encryption%20Algorithms.html">Encryption Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
@@ -44,4 +44,4 @@ XTS mode</a> (see the section <a href="Modes%20of%20Operation.html" style="text-
 Modes of Operation</a>).</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <a href="Kuznyechik.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>
+</div><div class="ClearBoth"></div></body></html>

doc/html/Cascades.html

@@ -10,8 +10,8 @@
 </head>
 <body>
 
-<div>                      
+<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">
@@ -27,7 +27,7 @@
 
 <div>
 <p>
-<a href="Documentation.html">Documentation</a>           
+<a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Encryption%20Algorithms.html">Encryption Algorithms</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
@@ -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
@@ -63,4 +88,4 @@
  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>
 </div>
-</body></html>
+</body></html>

doc/html/Changing Passwords and Keyfiles.html

@@ -10,8 +10,8 @@
 </head>
 <body>
 
-<div>                      
+<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">
@@ -27,7 +27,7 @@
 
 <div>
 <p>
-<a href="Documentation.html">Documentation</a>           
+<a href="Documentation.html">Documentation</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
 <a href="Security%20Requirements%20and%20Precautions.html">Security Requirements and Precautions</a>
 <img src="arrow_right.gif" alt=">>" style="margin-top: 5px">
@@ -53,4 +53,4 @@ The following sections of this chapter contain additional information pertaining
 </li><li><a href="Defragmenting.html"><em>Defragmenting</em></a>
 </li><li><a href="Reallocated%20Sectors.html"><em>Reallocated Sectors</em></a>
 </li></ul>
-</div><div class="ClearBoth"></div></body></html>
+</div><div class="ClearBoth"></div></body></html>