Language XML files: Update Arabic translation (contributed by Ali Khojah)

Translated the latest strings for TRIM commands.

License.txt

@@ -700,7 +700,7 @@ Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
   Jean-loup Gailly        Mark Adler
   jloup@gzip.org          madler@alumni.caltech.edu
 ____________________________________________________________
-Copyright (C) 1999-2016 Dieter Baron and Thomas Klausner
+Copyright (C) 1999-2017 Dieter Baron and Thomas Klausner
 
 The authors can be contacted at <libzip@nih.at>
 
@@ -742,3 +742,31 @@ 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.
+____________________________________________________________

README.md

@@ -27,7 +27,7 @@ II. Linux and Mac OS X
     Instructions for Building VeraCrypt for Linux and Mac OS X.
 	Mac OS X specifics
 
-III. FreeBSD and OpenSolaris
+III. FreeBSD
 
 IV. Third-Party Developers (Contributors)
 
@@ -210,10 +210,12 @@ Thus, we recommend using a different OSX SDK version for building VeraCrypt.
 
 
 
-III. FreeBSD and OpenSolaris
+III. FreeBSD
 ============================
 
-FreeBSD and OpenSolaris are not yet supported.
+FreeBSD is supported starting from version 11.
+The build requirements and instructions are the same as Linux except that gmake
+should be used instead of make.
 
 
 
@@ -239,18 +241,18 @@ Copyright Information
 ---------------------
 
 This software as a whole:
-Copyright (c) 2013-2017 IDRIX. All rights reserved.
+Copyright (c) 2013-2018 IDRIX. All rights reserved.
 
 Portions of this software:
-Copyright (c) 2013-2017 IDRIX. All rights reserved.
+Copyright (c) 2013-2018 IDRIX. All rights reserved.
 Copyright (c) 2003-2012 TrueCrypt Developers Association. All rights reserved.
 Copyright (c) 1998-2000 Paul Le Roux. All rights reserved.
 Copyright (c) 1998-2008 Brian Gladman, Worcester, UK. All rights reserved.
 Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler.
 Copyright (c) 2016 Disk Cryptography Services for EFI (DCS), Alex Kolotnikov
-Copyright (c) Dieter Baron and Thomas Klausner.
+Copyright (C) 1999-2017 Dieter Baron and Thomas Klausner.
 Copyright (c) 2013, Alexey Degtyarev. All rights reserved.
-Copyright (c) 1999-2013,2014,2015,2016 Jack Lloyd. All rights reserved.
+Copyright (c) 1999-2016 Jack Lloyd. All rights reserved.
 
 For more information, please see the legal notices attached to parts of the
 source code.

doc/chm/VeraCrypt.hhp

@@ -17,6 +17,8 @@ arrow_right.gif
 Authenticity and Integrity.html
 Authors.html
 bank_30x30.png
+BC_Logo_30x30.png
+BCH_Logo_48x30.png
 Beginner's Tutorial.html
 Beginner's Tutorial_Image_001.jpg
 Beginner's Tutorial_Image_002.jpg
@@ -65,7 +67,10 @@ Donation_donate_Dollars.gif
 Donation_donate_Euros.gif
 Donation_donate_GBP.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 +85,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 +100,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

doc/chm/create_chm.bat

@@ -7,7 +7,7 @@ copy ..\html\* .
 
 hhc VeraCrypt.hhp
 
-del /F /Q *.html *.css *.jpg *.gif *.png
+del /F /Q *.html *.css *.jpg *.gif *.png *.svg
 
 
 

doc/html/Cascades.html

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

doc/html/Data Leaks.html

@@ -37,8 +37,11 @@
 <div class="wikidoc">
 <h2>Data Leaks</h2>
 <p>When a VeraCrypt volume is mounted, the operating system and third-party applications may write to unencrypted volumes (typically, to the unencrypted system volume) unencrypted information about the data stored in the VeraCrypt volume (e.g. filenames and
- locations of recently accessed files, databases created by file indexing tools, etc.), or the data itself in an unencrypted form (temporary files, etc.), or unencrypted information about the filesystem residing in the VeraCrypt volume. Note that Windows automatically
+ locations of recently accessed files, databases created by file indexing tools, etc.), or the data itself in an unencrypted form (temporary files, etc.), or unencrypted information about the filesystem residing in the VeraCrypt volume.</p>
- records large amounts of potentially sensitive data, such as the names and locations of files you open, applications you run, etc.</p>
+<p>Note that Windows automatically records large amounts of potentially sensitive data, such as the names and locations of files you open, applications you run, etc. For example, Windows uses a set of Registry keys known as “shellbags” to store the name, size, view, icon, and position of a folder when using Explorer. 
+Each time you open a folder, this information is updated including the time and date of access. Windows Shellbags may be found in a few locations, depending on operating system version and user profile. 
+On a Windows XP system, shellbags may be found under <strong>"HKEY_USERS\{USERID}\Software\Microsoft\Windows\Shell\"</strong> and <strong>"HKEY_USERS\{USERID}\Software\Microsoft\Windows\ShellNoRoam\"</strong>.
+On a Windows 7 system, shellbags may be found under <strong>"HEKY_USERS\{USERID}\Local Settings\Software\Microsoft\Windows\Shell\"</strong>. More information available at <a href="https://www.sans.org/reading-room/whitepapers/forensics/windows-shellbag-forensics-in-depth-34545" target="_blank">https://www.sans.org/reading-room/whitepapers/forensics/windows-shellbag-forensics-in-depth-34545</a>.
 <p>Also, starting from Windows 8, every time a VeraCrypt volume that is formatted using NTFS is mounted, an Event 98 is written for the system Events Log and it will contain the device name (\\device\VeraCryptVolumeXX) of the volume. This event log &quot;feature&quot;
  was introduced in Windows 8 as part of newly introduced NTFS health checks as explained
 <a href="https://blogs.msdn.microsoft.com/b8/2012/05/09/redesigning-chkdsk-and-the-new-ntfs-health-model/" target="_blank">

doc/html/Donation.html

@@ -27,78 +27,75 @@
 
 <div class="wikidoc">
 <h1>Donation to VeraCrypt</h1>
-<p>You can support VeraCrypt development through donations using PayPal, Bitcoins, bank transfers. It is also possible to donate using Flattr and Tibit.</p>
+<p>You can support VeraCrypt development through donations using PayPal, bank transfers and cryptocurrencies (<a href="#Bitcoin">Bitcoin</a>, <a href="#BitcoinCash">Bitcoin Cash</a>, <a href="#Litecoin">Litecoin</a> and <a href="#Monero">Monero</a>). It is also possible to donate using Liberapay and Flattr.</p>
-<table border="1" width="645" style="height:427px">
+
+<hr>
+<h3><img src="paypal_30x30.png" style="vertical-align: middle; margin-right: 5px">PayPal</h3>
+<table>
 <tbody>
 <tr>
-<th>
+<td align="center"><a title="Donate to VeraCrypt in Euros" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=H25GJLUDHBMB6" target="_blank"><img src="Donation_donate_Euros.gif" alt="" width="92" height="26"></a></td>
-<h4>PayPal</h4>
+<td align="center"><a title="VeraCrypt Donation in USD" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=B8PU86SHE2ZVA" target="_blank"><img src="Donation_donate_Dollars.gif" alt="" width="92" height="26"></a></td>
-</th>
+<td align="center"><a title="VeraCrypt Donation in GBP" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MFAZACXK9NXT8" target="_blank"><img src="Donation_donate_GBP.gif" alt="" width="92" height="26"></a></td>
-<th>
+<td align="center"><a title="VeraCrypt Donation in Canadian Dollar" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QAN6T5E5F7F5J" target="_blank"><img src="Donation_donate_Dollars.gif" alt="" width="92" height="26"></a></td>
-<h4>Bitcoins</h4>
+<td align="center"><a title="VeraCrypt Donation in Swiss Francs" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=98RJHVLY5NJ5U" target="_blank"><img src="Donation_donate_CHF.gif" alt="" width="92" height="26"></a></td>
-</th>
+<td align="center"><a title="VeraCrypt Donation in Japanese Yen" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=M9DXZ83WD7S8Y" target="_blank"><img src="Donation_donate_YEN.gif" alt="" width="92" height="26"></a></td>
-<th>
-<h4 style="text-align:center">Others</h4>
-</th>
 </tr>
 <tr>
-<td>
+<td align="center">Euro</td>
-<table border="1">
+<td align="center">US Dollar</td>
-<tbody>
+<td align="center">Pound Sterling</td>
-<tr>
+<td align="center">Canadian Dollar</td>
-<td><strong>Euro</strong></td>
+<td align="center">Swiss Franc</td>
-<td>
+<td align="center">Japanese Yen</td>
-<h3><a title="Donate to VeraCrypt in Euros" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=H25GJLUDHBMB6" target="_blank"><img src="Donation_donate_Euros.gif" alt="" width="92" height="26"></a></h3>
-</td>
-</tr>
-<tr>
-<td><strong>US Dollar</strong></td>
-<td>
-<h3><a title="VeraCrypt Donation in USD" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=B8PU86SHE2ZVA" target="_blank"><img src="Donation_donate_Dollars.gif" alt="" width="92" height="26"></a></h3>
-</td>
-</tr>
-<tr>
-<td><strong>Pound Sterling</strong></td>
-<td>
-<h3><a title="VeraCrypt Donation in GBP" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=MFAZACXK9NXT8" target="_blank"><img src="Donation_donate_GBP.gif" alt="" width="92" height="26"></a></h3>
-</td>
-</tr>
-<tr>
-<td><strong>Canadian Dollar</strong></td>
-<td>
-<h3><a title="VeraCrypt Donation in Canadian Dollar" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QAN6T5E5F7F5J" target="_blank"><img src="Donation_donate_Dollars.gif" alt="" width="92" height="26"></a></h3>
-</td>
-</tr>
-<tr>
-<td><strong>Swiss Franc</strong></td>
-<td>
-<h3><a title="VeraCrypt Donation in Swiss Francs" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=98RJHVLY5NJ5U" target="_blank"><img src="Donation_donate_CHF.gif" alt="" width="92" height="26"></a></h3>
-</td>
-</tr>
-<tr>
-<td><strong>Japanese Yen</strong></td>
-<td>
-<h3><a title="VeraCrypt Donation in Japanese Yen" href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=M9DXZ83WD7S8Y" target="_blank"><img src="Donation_donate_YEN.gif" alt="" width="92" height="26"></a></h3>
-</td>
-</tr>
-</tbody>
-</table>
-</td>
-<td style="text-align:center; vertical-align:middle">
-<p><img src="Donation_VeraCrypt_Bitcoin.png" alt="VeraCrypt Bitcoin Address" width="250" height="250"></p>
-<p><strong>1NRoPQsm8by5iWyMMmHQy3P5takur3kYgG</strong></p>
-</td>
-<td style="text-align:left; vertical-align:top">
-<p><strong>Tibit:<br>
-<a title="Donate a tib to VeraCrypt" href="https://tib.me/1NRoPQsm8by5iWyMMmHQy3P5takur3kYgG/VeraCrypt/?TIB=https://veracrypt.codeplex.com" target="_blank"><img src="Home_tibitDonateButton.png" alt="Donate using Tibit" width="120" height="40"></a></strong></p>
-<p>&nbsp;</p>
-<p><strong>Flattr:</strong><br>
-<a title="Donate using Flattr" href="https://flattr.com/submit/auto?user_id=idrix&url=https://veracrypt.codeplex.com&title=VeraCrypt" target="_blank"><img title="Flattr VeraCrypt" src="flattr-badge-large.png" alt="Flattr VeraCrypt" width="93" height="20" border="0"></a></p>
-</td>
 </tr>
 </tbody>
 </table>
+
+<hr>
 <p><img src="bank_30x30.png" style="margin-right: 5px"><strong>Donate using bank transfer:</strong>&nbsp;<a href="Contact.html" target="_blank.html">contact us</a> for bank account details (based in France).</p>
+
+<hr>
+<h3>Donation Platforms:</h3>
+<ul>
+<li><strong>Liberapay: <a href="https://liberapay.com/VeraCrypt/donate" target="_blank"><img alt="Donate using Liberapay" src="liberapay_donate.svg" style="vertical-align: middle; margin-bottom: 5px"></a></strong></li>
+<li><strong>Flattr: <a title="Donate using Flattr" href="https://flattr.com/submit/auto?user_id=idrix&url=https://www.veracrypt.fr&title=VeraCrypt" target="_blank"><img title="Flattr VeraCrypt" src="flattr-badge-large.png" alt="Flattr VeraCrypt" width="93" height="20" border="0" style="vertical-align: middle; margin-bottom: 5px"></a></strong></li>
+</ul>
+
+<hr>
+<h3 id="Bitcoin"><img src="BC_Logo_30x30.png" style="vertical-align: middle; margin-right: 5px">Bitcoin</h3>
+<p><img src="Donation_VeraCrypt_Bitcoin_small.png" alt="VeraCrypt Bitcoin Address" width="150" height="150"></p>
+<p><strong>1NRoPQsm8by5iWyMMmHQy3P5takur3kYgG</strong></p>
+
+<hr>
+<h3 id="BitcoinCash"><img src="BCH_Logo_48x30.png" style="vertical-align: middle; margin-right: 5px">Bitcoin Cash</h3>
+<p><img src="Donation_VeraCrypt_BitcoinCash.png" alt="VeraCrypt Bitcoin Cash Address" width="150" height="150"></p>
+<p><strong>1AYu65KkZvriz2DUd6FJJZp73NYqEdHzxa</strong></p>
+
+<hr>
+<h3 id="Litecoin"><img src="LTC_Logo_30x30.png" style="vertical-align: middle; margin-right: 5px">Litecoin</h3>
+<p><img src="Donation_VeraCrypt_Litecoin.png" alt="VeraCrypt Litecoin Address" width="150" height="150"></p>
+<p><strong>LZkkfkMs4qHmWaP9DAvS1Ep1fAxaf8A2T7</strong></p>
+
+<hr>
+<h3 id="Monero"><img src="Monero_Logo_30x30.png" style="vertical-align: middle; margin-right: 5px">Monero</h3>
+<p><img src="Donation_VeraCrypt_Monero.png" alt="VeraCrypt Monero Address" width="150" height="150"></p>
+<p><strong>464GGAau9CE5XiER4PSZ6SMbK4wxPCgdm2r36uqnL8NoS6zDjxUYXnyQymbUsK1QipDMY2fsSgDyZ3tMaLfpWvSr2EE8wMw</strong></p>
+
+
+<hr>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
+<p>&nbsp;</p>
 <p>&nbsp;</p>
 <p>&nbsp;</p>
 </div><div class="ClearBoth"></div></body></html>

doc/html/Encryption Algorithms.html

@@ -154,6 +154,66 @@ XTS</td>
 </tr>
 <tr style="text-align:left">
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Camellia-Kuznyechik</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Camellia-Serpent</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Kuznyechik-AES</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Kuznyechik-Serpent-Camellia</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+<a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Kuznyechik-Twofish</a></td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+&nbsp;</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+256; 256</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+128</td>
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
+XTS</td>
+</tr>
+<tr style="text-align:left">
+<td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 <a href="Cascades.html" style="color:#0080c0; text-decoration:none.html">Serpent-AES</a></td>
 <td style="color:#000000; font-size:11px; line-height:13px; font-family:Verdana,Arial,Helvetica,sans-serif; text-align:center; vertical-align:middle; border-width:0px 1px 0px 0px; border-style:none solid solid none; padding:5px; border-color:white #000000 #ffffff white">
 &nbsp;</td>

doc/html/FAQ.html

@@ -35,7 +35,7 @@
 <div class="wikidoc">
 <h1>Frequently Asked Questions</h1>
 <div style="text-align:left; margin-bottom:19px; padding-top:0px; padding-bottom:0px; margin-top:0px">
-Last Updated December 23th, 2015</div>
+Last Updated July 2nd, 2017</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <em style="text-align:left">This document is not guaranteed to be error-free and is provided &quot;as is&quot; without warranty of any kind. For more information, see
 <a href="Disclaimers.html" target="_blank" style="text-align:left; color:#0080c0; text-decoration:none.html">
@@ -685,12 +685,12 @@ VeraCrypt User Guide</a>.</div>
 <br style="text-align:left">
 <strong style="text-align:left">Is the online documentation available for download as a single file?</strong></div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
-Yes, the documentation is contained in the file <em style="text-align:left">VeraCrypt User Guide.pdf</em> that is included in all official VeraCrypt distribution packages. You can also download the PDF using the link available at the home page
+Yes, the documentation is contained in the file <em style="text-align:left">VeraCrypt User Guide.chm</em> that is included in official VeraCrypt installer for Windows. You can also download the CHM using the link available at the home page
 <a href="https://www.veracrypt.fr/en/Downloads.html" target="_blank">https://www.veracrypt.fr/en/downloads/</a>. Note that you do
-<em style="text-align:left">not</em> have to install VeraCrypt to obtain the PDF documentation. Just run the self-extracting installation package and then select
+<em style="text-align:left">not</em> have to install VeraCrypt to obtain the CHM documentation. Just run the self-extracting installation package and then select
 <em style="text-align:left">Extract</em> (instead of <em style="text-align:left">
 Install</em>) on the second page of the VeraCrypt Setup wizard. Also note that when you
-<em style="text-align:left">do</em> install VeraCrypt, the PDF documentation is automatically copied to the folder to which VeraCrypt is installed, and is accessible via the VeraCrypt user interface (by pressing F1 or choosing
+<em style="text-align:left">do</em> install VeraCrypt, the CHM documentation is automatically copied to the folder to which VeraCrypt is installed, and is accessible via the VeraCrypt user interface (by pressing F1 or choosing
 <em style="text-align:left">Help</em> &gt; <em style="text-align:left">User's Guide</em>).</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">

doc/html/Header Key Derivation.html

@@ -70,8 +70,8 @@ PIM </a>value is not specified or if it is equal to zero, VeraCrypt uses the def
 <p>When a <a href="Personal%20Iterations%20Multiplier%20%28PIM%29.html">
 PIM </a>value is given by the user, the number of iterations of the key derivation function is calculated as follows:</p>
 <ul>
-<li>For system partition encryption (boot encryption): Iterations = <strong>PIM x 2048</strong>
+<li>For system encryption that doesn't use SHA-512 or Whirlpool: Iterations = <strong>PIM x 2048</strong>
-</li><li>For standard containers and other partitions: Iterations = <strong>15000 &#43; (PIM x 1000)</strong>
+</li><li>For system encryption that uses SHA-512 or Whirlpool, non-system encryption and file containers: Iterations = <strong>15000 &#43; (PIM x 1000)</strong>
 </li></ul>
 </div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">

doc/html/Incompatibilities.html

@@ -34,8 +34,8 @@
 
 <div class="wikidoc">
 <h1>Incompatibilities</h1>
-<h4 style="text-align:left; font-family:Arial,Helvetica,Verdana,sans-serif; font-weight:bold; margin-top:0px; font-size:12px; margin-bottom:1px">
+<h2>
-Activation of Adobe Photoshop&reg; and Other Products Using FLEXnet Publisher&reg; / SafeCast</h4>
+Activation of Adobe Photoshop&reg; and Other Products Using FLEXnet Publisher&reg; / SafeCast</h2>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <em style="text-align:left">Note: The issue described below does <strong style="text-align:left">
 not</strong> affect you if you use a non-cascade encryption algorithm (i.e., AES, Serpent, or Twofish).* The issue also does
@@ -62,7 +62,14 @@ VeraCrypt Rescue Disk</a>.</div>
 <strong style="text-align:left">Possible permanent solution</strong>: decrypt the system partition/drive, and then re-encrypt it using a non-cascade encryption algorithm (i.e., AES, Serpent, or Twofish).*</div>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 Please note that this not a bug in VeraCrypt (the issue is caused by inappropriate design of the third-party activation software).</div>
-<p>&nbsp;</p>
+<h2>Outpost Firewall and Outpost Security Suite</h2>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+If Outpost Firewall or Outpost Security Suite is installed with Proactive Protection enabled, the machine freezes completely for 5-10 seconds during the volume mount/dismount operation. This is caused by a conflict between Outpost System Guard option that protects "Active Desktop" objects and VeraCrypt waiting dialog displayed during mount/dismount operations.</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+A workaround that fixes this issue is to disable VeraCrypt waiting dialog in the Preferences: use menu "Settings -> Preferences" and check the option "Don't show wait message dialog when performing operations".</div>
+<div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
+More information can be found at <a href="https://sourceforge.net/p/veracrypt/tickets/100/">https://sourceforge.net/p/veracrypt/tickets/100/</a>
+</div>
 <hr align="left" size="1" width="189" style="text-align:left; height:0px; border-width:0px 1px 1px; border-style:solid; border-color:#000000">
 <p><span style="text-align:left; font-size:10px; line-height:12px">* The reason is that the VeraCrypt Boot Loader is smaller than the one used for cascades of ciphers and, therefore, there is enough space in the first drive track for a backup of the VeraCrypt
  Boot Loader. Hence, whenever the VeraCrypt Boot Loader is damaged, its backup copy is run automatically instead.</span><br style="text-align:left">

doc/html/Issues and Limitations.html

@@ -44,7 +44,12 @@
 <br>
 Also, there are other entries whose name start with &quot;#{&quot; and &quot;\??\Volume{&quot;: double click on each one of them and remove the ones whose data value contains the name &quot;VeraCrypt&quot; and &quot;TrueCrypt&quot;.
 </li></ul>
-</li></ul>
+</li>
+<li>On some Windows machines, VeraCrypt may hang intermittently when mounting or dismounting a volume. Similar hanging may affect other running applications during veraCrypt mounting or dismounting operations.
+This issue is caused by a conflict between VeraCrypt waiting dialog displayed during mount/dismount operations and other software installed on the machine (e.g. Outpost Firewall Pro).
+In such situations, the issue can be solved by disabling VeraCrypt waiting dialog in the Preferences: use menu "Settings -> Preferences" and check the option "Don't show wait message dialog when performing operations".
+</li>
+</ul>
 <h3 id="limitations">Limitations</h3>
 <ul>
 <li>[<em>Note: This limitation does not apply to users of Windows Vista and later versions of Windows.</em>] On Windows XP/2003, VeraCrypt does not support encrypting an entire system drive that contains extended (logical) partitions. You can encrypt an entire

doc/html/Legal Information.html

@@ -43,10 +43,10 @@ can be found here</a>.</p>
 <h3>Copyright Information</h3>
 <p>This software as a whole:<br>
 <br>
-Copyright &copy; 2013-2016 IDRIX. All rights reserved.<br>
+Copyright &copy; 2013-2018 IDRIX. All rights reserved.<br>
 <br>
 Portions of this software:</p>
-<p>Copyright &copy; 2013-2016 IDRIX. All rights reserved.<br>
+<p>Copyright &copy; 2013-2018 IDRIX. All rights reserved.<br>
 <br>
 Copyright &copy; 2003-2012 TrueCrypt Developers Association. All rights reserved.</p>
 <p>Copyright &copy; 1998-2000 Paul Le Roux. All rights reserved.<br>
@@ -54,9 +54,9 @@ Copyright &copy; 2003-2012 TrueCrypt Developers Association. All rights reserved
 Copyright &copy; 1998-2008 Brian Gladman, Worcester, UK. All rights reserved.</p>
 <p>Copyright &copy; 1995-2017 Jean-loup Gailly and Mark Adler.</p>
 <p>Copyright &copy; 2016 Disk Cryptography Services for EFI (DCS), Alex Kolotnikov</p>
-<p>Copyright &copy; 1999-2014 Dieter Baron and Thomas Klausner.</p>
+<p>Copyright &copy; 1999-2017 Dieter Baron and Thomas Klausner.</p>
 <p>Copyright &copy; 2013, Alexey Degtyarev. All rights reserved.</p>
-<p>Copyright &copy; 1999-2013,2014,2015,2016 Jack Lloyd. All rights reserved.<br>
+<p>Copyright &copy; 1999-2016 Jack Lloyd. All rights reserved.<br>
 <br>
 For more information, please see the legal notices attached to parts of the source code.</p>
 <h3>Trademark Information</h3>

doc/html/Personal Iterations Multiplier (PIM).html

@@ -44,7 +44,7 @@
 Header Key Derivation</a>).</p>
 <p>When a PIM value is specified, the number of iterations is calculated as follows:</p>
 <ul>
-<li>For system encryption: Iterations = <strong>PIM x 2048</strong> </li><li>For non-system encryption and file containers: Iterations = <strong>15000 &#43; (PIM x 1000)</strong>
+<li>For system encryption that doesn't use SHA-512 or Whirlpool: Iterations = <strong>PIM x 2048</strong> </li><li>For system encryption that uses SHA-512 or Whirlpool, non-system encryption and file containers: Iterations = <strong>15000 &#43; (PIM x 1000)</strong>
 </li></ul>
 <p>Prior to version 1.12, the security of a VeraCrypt volume was only based on the password strength because VeraCrypt was using a fixed number of iterations.<br>
 With the introduction of PIM, VeraCrypt has a 2-dimensional security space for volumes based on the couple (Password, PIM). This provides more flexibility for adjusting the desired security level while also controlling the performance of the mount/boot operation.</p>
@@ -61,8 +61,8 @@ When creating a volume or when changing the password, the user has the possibili
 <div>During the creation of a volume or the encryption of the system, VeraCrypt forces the PIM value to be greater than or equal to a certain minimal value when the password is less than 20 characters. This check is done in order to ensure that, for short passwords,
  the security level is at least equal to the default level provided by an empty PIM.</div>
 <div>&nbsp;</div>
-<div>The PIM minimal value for short passwords is <strong>98</strong> for system encryption and
+<div>The PIM minimal value for short passwords is <strong>98</strong> for system encryption that doesn't use SHA-512 or Whirlpool and
-<strong>485</strong> for non-system encryption and files containers. For password with 20 characters and more, the PIM minimal value is
+<strong>485</strong> for the other cases. For password with 20 characters and more, the PIM minimal value is
 <strong>1</strong>. In all cases, leaving the PIM empty or setting its value to 0 will make VeraCrypt use the default high number of iterations as explained in section
 <a href="Header%20Key%20Derivation.html">
 Header Key Derivation</a>.</div>
@@ -70,7 +70,7 @@ Header Key Derivation</a>.</div>
 Motivations behind using a custom PIM value can be:<br>
 <ul>
 <li>Add an extra secret parameter (PIM) that an attacker will have to guess </li><li>Increase security level by using large PIM values to thwart future development of brute force attacks.
-</li><li>Speeding up booting or mounting through the use of a small PIM value (less than 98 for system encryption and less than 485 for the other cases)
+</li><li>Speeding up booting or mounting through the use of a small PIM value (less than 98 for system encryption that doesn't use SHA-512 or Whirlpool and less than 485 for the other cases)
 </li></ul>
 <p>The screenshots below show the step to mount a volume using a PIM equal to 231:</p>
 <table style="margin-left:auto; margin-right:auto">

doc/html/Release Notes.html

@@ -34,6 +34,146 @@
 
 <div class="wikidoc">
 <h1>Release Notes</h1>
+
+<p><strong style="text-align:left">1.22 </strong>(March 30<sup>th</sup>, 2018):</p>
+<ul>
+<li><strong>All OSs:</strong>
+<ul>
+<li>SIMD speed optimization for Kuznyechik cipher implementation (up to 2x speedup).</li>
+<li>Add 5 new cascades of cipher algorithms: Camellia-Kuznyechik, Camellia-Serpent, Kuznyechik-AES, Kuznyechik-Serpent-Camellia and Kuznyechik-Twofish.</li>
+</ul>
+</li>
+<li><strong>Windows:</strong>
+<ul>
+<li>MBR Bootloader: Fix failure to boot hidden OS on some machines.</li>
+<li>MBR Bootloader: Reduce CPU usage during password prompt.</li>
+<li>Security enhancement: Add option to block TRIM command for system encryption on SSD drives.</li>
+<li>Implement TRIM support for non-system SSD drives and add option to enable it (TRIM is disabled by default for non-system volumes).</li>
+<li>Better fix for "Parameter Incorrect" issues during EFI system encryption in some machines.</li>
+<li>Driver: remove unnecessary dependency to wcsstr which can cause issues on some machines.</li>
+<li>Driver: Fix "Incorrect Parameter" error when mounting volumes on some machines.</li>
+<li>Fix failure to mount system favorites during boot on some machines.</li>
+<li>Fix current application losing focus when VeraCrypt is run in command line with /quit /silent switches.</li>
+<li>Fix some cases of external applications freezing during mount/dismount.</li>
+<li>Fix rare cases of secure desktop for password dialog not visible which caused UI to block.</li>
+<li>Update libzip to version 1.5.0 that include fixes for some security issues.</li>
+<li>Extend Secure Desktop feature to smart card PIN entry dialog.</li>
+<li>Fix truncated license text in installer wizard.</li>
+<li>Add portable package that allows extracting binaries without asking for admin privileges.</li>
+<li>Simplify format of language XML files.</li>
+<li>Workaround for cases where password dialog doesn't get keyboard focus if Secure Desktop is not enabled.</li>
+</ul>
+<li><strong>Linux:</strong>
+<ul>
+<li>Fix failure to install GUI version under recent versions of KDE.</li>
+<li>Fix wxWidgets assertion failed when backing up/restoring volume header.</li>
+</ul>
+</li>
+<li><strong>MacOSX:</strong>
+<ul>
+<li>Fix issue preventing some local help files from opening in the browser.</li>
+</ul>
+</li>
+</ul>
+
+<p><strong style="text-align:left">1.21 </strong>(July 9<sup>th</sup>, 2017):</p>
+<ul>
+<li><strong>All OSs:</strong>
+<ul>
+<li>Fix 1.20 regression crash when running on CPU not supporting extended features.</li>
+</ul>
+</li>
+<li><strong>Windows:</strong>
+<ul>
+<li>Fix 1.20 regression that caused PIM value stored in favorites to be ignored during mount.</li>
+<li>Fix 1.20 regression that causes system favorites not to mount in some cases.</li>
+<li>Fix some cases of "Parameter Incorrect" error during EFI system encryption wizard.</li>
+<li>Install PDF documents related to EFI system encryption configuration for advanced users:
+<ul>
+<li>disk_encryption_v1_2.pdf related to EFI hidden OS and full fisk encryption</li>
+<li>dcs_tpm_owner_02.pdf related to TPM configuration for EFI system encryption.</li>
+</li>
+</ul>
+</ul>
+</li>
+<li><strong>FreeBSD:</strong>
+<ul>
+<li>Add support for building on FreeBSD.</li>
+</ul>
+</li>
+</ul>
+
+<p><strong style="text-align:left">1.20 </strong>(June 29<sup>th</sup>, 2017):</p>
+<ul>
+<li><strong>All OSs:</strong>
+<ul>
+<li>Use 64-bit optimized assembly implementation of Twofish and Camellia by Jussi Kivilinna.
+<ul>
+<li>Camellia 2.5 faster when AES-NI supported by CPU. 30% faster without it.</li>
+</ul>
+</li>
+<li>Use optimized implementation for SHA-512/SHA256.
+<ul>
+<li>33% speedup on 64-bit systems.</li>
+</ul>
+</li>
+<li>Deploy local HTML documentation instead of User Guide PDF.</li>
+<li>Change links in UI from ones on Codeplex to ones hosted at veracrypt.fr </li>
+<li>Security: build binaries with support for Address Space Layout Randomization (ASLR).</li>
+</ul>
+</li>
+<li><strong>Windows:</strong>
+<ul>
+<li>Several fixes and modifications for EFI System Encryption:
+<ul>
+<li>Fix bug in EFI system decryption using EFI Rescue Disk</li>
+<li>Add support for TPM 1.2 and TPM 2.0 (experimental) through DCS low level configuration.
+<ul>
+<li><a href="https://dc5.sourceforge.io/docs/dcs_tpm_owner_02.pdf" target="_blank">https://dc5.sourceforge.io/docs/dcs_tpm_owner_02.pdf</a>
+</li>
+</ul>
+<li>Add Support for EFI full disk encryption and hidden OS using manual procedure (not exposed in UI).
+<ul>
+<li><a href="https://dc5.sourceforge.io/docs/disk_encryption_v1_2.pdf" target="_blank">https://dc5.sourceforge.io/docs/disk_encryption_v1_2.pdf</a>
+</li>
+</ul>
+</li>
+</li>
+</ul>
+</li>
+
+<li>Enable using Secure Desktop for password entry. Add preferences option and command line switch (/secureDesktop) to activate it.</li>
+<li>Use default mount parameters when mounting multiple favorites with password caching.</li>
+<li>Enable specifying PRF and TrueCryptMode for favorites.</li>
+<li>Preliminary driver changes to support EFI hidden OS functionality.</li>
+<li>Fix Streebog not recognized by /hash command line.</li>
+<li>Add support for ReFS filesystem on Windows 10 when creating normal volumes</li>
+<li>Fix high CPU usage when favorite configured to mount with VolumeID on arrival.</li>
+<li>Use CHM file for User Guide instead of PDF.</li>
+<li>Fix false warning in case of EFI system encryption about Windows not installed on boot drive.</li>
+<li>Enhancements to driver handling of various disk IOCTL.</li>
+<li>Enhancements to EFI bootloader. Add possibility to manually edit EFI configuration file.</li>
+<li>Driver Security: Use enhanced protection of NX pool under Windows 8 and later.</li>
+<li>Reduce performance impact of internal check for disconnected network drives.</li>
+<li>Minor fixes.</li>
+</ul>
+</li>
+<li><strong>MacOSX:</strong>
+<ul>
+<li>OSX 10.7 or newer is required to run VeraCrypt.</li>
+<li>Make VeraCrypt default handler of .hc & .tc files.</li>
+<li>Add custom VeraCrypt icon to .hc and .tc files in Finder.</li>
+<li>Check TrueCryptMode in password dialog when opening container file with .tc extension.</li>
+</ul>
+</li>
+<li><strong>Linux:</strong>
+<ul>
+<li>Check TrueCryptMode in password dialog when opening container file with .tc extension.</li>
+<li>Fix executable stack in resulting binary which was caused by crypto assembly files missing the GNU-stack note.</li>
+</ul>
+</li>
+</ul>
+
 <p><strong style="text-align:left">1.19 </strong>(October 17<sup>th</sup>, 2016):</p>
 <ul>
 <li><strong>All OSs:</strong>

doc/html/Removable Medium Volume.html

@@ -38,7 +38,7 @@
 <h2>Volume Mounted as Removable Medium</h2>
 <p>This section applies to VeraCrypt volumes mounted when one of the following options is enabled (as applicable):</p>
 <ul>
-<li><em>Tools</em> &gt; <em>Preferences</em> &gt; <em>Mount volumes as removable media</em>
+<li><em>Settings</em> &gt; <em>Preferences</em> &gt; <em>Mount volumes as removable media</em>
 </li><li><em>Mount Options</em> &gt; <em>Mount volume as removable medium</em> </li><li><em>Favorites</em> &gt; <em>Organize Favorite Volumes</em> &gt; <em>Mount selected volume as removable medium</em>
 </li><li><em>Favorites</em> &gt; <em>Organize System Favorite Volumes</em> &gt; <em>Mount selected volume as removable medium</em>
 </li></ul>

doc/html/Supported Operating Systems.html

@@ -44,14 +44,15 @@ Windows Server 2012 </li><li style="text-align:left; margin-top:0px; margin-bott
 Windows Server 2008 R2 (64-bit) </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 Windows Server 2008 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 Windows Server 2003 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Mac OS X 10.13 High Sierra </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 Mac OS X 10.12 Sierra </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 Mac OS X 10.11 El Capitan </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 Mac OS X 10.10 Yosemite </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 Mac OS X 10.9 Mavericks </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 Mac OS X 10.8 Mountain Lion </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 Mac OS X 10.7 Lion </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Mac OS X 10.6 Snow Leopard </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
+Linux x86 (32-bit and 64-bit versions, kernel 2.6 or compatible) </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
-Linux x86 (32-bit and 64-bit versions, kernel 2.6 or compatible) </li></ul>
+FreeBSD x86 (32-bit and 64-bit versions, starting from version 11) </li></ul>
 <div style="text-align:left; margin-top:19px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <br style="text-align:left">
 <span style="text-align:left; font-size:10px; line-height:12px">Note: The following operating systems (among others) are not supported: Windows RT, Windows 2003 IA-64, Windows 2008 IA-64, Windows XP IA-64, and the Embedded/Tablet versions of Windows.</span></div>

doc/html/liberapay_donate.svg

@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="83" height="30"><rect id="back" fill="#f6c915" x="1" y=".5" width="82" height="29" rx="4"/><svg viewBox="0 0 80 80" height="16" width="16" x="7" y="7"><g transform="translate(-78.37-208.06)" fill="#1a171b"><path d="m104.28 271.1c-3.571 0-6.373-.466-8.41-1.396-2.037-.93-3.495-2.199-4.375-3.809-.88-1.609-1.308-3.457-1.282-5.544.025-2.086.313-4.311.868-6.675l9.579-40.05 11.69-1.81-10.484 43.44c-.202.905-.314 1.735-.339 2.489-.026.754.113 1.421.415 1.999.302.579.817 1.044 1.546 1.395.729.353 1.747.579 3.055.679l-2.263 9.278"/><path d="m146.52 246.14c0 3.671-.604 7.03-1.811 10.07-1.207 3.043-2.879 5.669-5.01 7.881-2.138 2.213-4.702 3.935-7.693 5.167-2.992 1.231-6.248 1.848-9.767 1.848-1.71 0-3.42-.151-5.129-.453l-3.394 13.651h-11.162l12.52-52.19c2.01-.603 4.311-1.143 6.901-1.622 2.589-.477 5.393-.716 8.41-.716 2.815 0 5.242.428 7.278 1.282 2.037.855 3.708 2.024 5.02 3.507 1.307 1.484 2.274 3.219 2.904 5.205.627 1.987.942 4.11.942 6.373m-27.378 15.461c.854.202 1.91.302 3.167.302 1.961 0 3.746-.364 5.355-1.094 1.609-.728 2.979-1.747 4.111-3.055 1.131-1.307 2.01-2.877 2.64-4.714.628-1.835.943-3.858.943-6.071 0-2.161-.479-3.998-1.433-5.506-.956-1.508-2.615-2.263-4.978-2.263-1.61 0-3.118.151-4.525.453l-5.28 21.948"/></g></svg><text fill="#1a171b" text-anchor="middle" font-family="Helvetica Neue,Helvetica,Arial,sans-serif"
+          font-weight="700" font-size="14" x="50" y="20">Donate</text></svg>

src/Boot/Windows/BootCommon.h

@@ -17,7 +17,7 @@
 #include "BootDefs.h"
 
 // The user will be advised to upgrade the rescue disk if upgrading from the following or any previous version
-#define TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION 0x0118
+#define TC_RESCUE_DISK_UPGRADE_NOTICE_MAX_VERSION 0x0121
 
 #define TC_BOOT_LOADER_AREA_SIZE (TC_BOOT_LOADER_AREA_SECTOR_COUNT * TC_SECTOR_SIZE_BIOS)
 

src/Boot/Windows/BootConsoleIo.cpp

@@ -19,17 +19,19 @@
 
 static int ScreenOutputDisabled = 0;
 
+#if defined(TC_TRACE_INT13) || !defined(TC_WINDOWS_BOOT_RESCUE_DISK_MODE)
 void DisableScreenOutput ()
 {
 	++ScreenOutputDisabled;
 }
+#endif
 
-
+#ifdef TC_TRACE_INT13
 void EnableScreenOutput ()
 {
 	--ScreenOutputDisabled;
 }
-
+#endif
 
 void PrintChar (char c)
 {
@@ -236,11 +238,32 @@ byte GetKeyboardChar ()
 	return GetKeyboardChar (nullptr);
 }
 
+/*
+inline void Sleep ()
+{
+	__asm
+	{
+		mov al, 0
+		mov ah, 0x86
+		// Sleep for 250 milliseconds = 250 000 microseconds = 0x0003D090
+		mov cx, 0x0003
+		mov dx, 0xD090
+		int 0x15
+	}
+}
+*/
 
 byte GetKeyboardChar (byte *scanCode)
 {
 	// Work around potential BIOS bugs (Windows boot manager polls the keystroke buffer)
-	while (!IsKeyboardCharAvailable());
+	while (!IsKeyboardCharAvailable())
+	{
+		// reduce CPU usage by halting CPU until the next external interrupt is fired
+		__asm
+		{		
+			hlt
+		}
+	}
 
 	byte asciiCode;
 	byte scan;

src/Boot/Windows/BootDiskIo.cpp

@@ -157,6 +157,7 @@ BiosResult ReadWriteSectors (bool write, uint16 bufferSegment, uint16 bufferOffs
 	return result;
 }
 
+#ifdef TC_WINDOWS_BOOT_RESCUE_DISK_MODE
 
 BiosResult ReadWriteSectors (bool write, byte *buffer, byte drive, const ChsAddress &chs, byte sectorCount, bool silent)
 {
@@ -165,18 +166,19 @@ BiosResult ReadWriteSectors (bool write, byte *buffer, byte drive, const ChsAddr
 	return ReadWriteSectors (write, codeSeg, (uint16) buffer, drive, chs, sectorCount, silent);
 }
 
-
 BiosResult ReadSectors (byte *buffer, byte drive, const ChsAddress &chs, byte sectorCount, bool silent)
 {
 	return ReadWriteSectors (false, buffer, drive, chs, sectorCount, silent);
 }
 
-
+#if 0
 BiosResult WriteSectors (byte *buffer, byte drive, const ChsAddress &chs, byte sectorCount, bool silent)
 {
 	return ReadWriteSectors (true, buffer, drive, chs, sectorCount, silent);
 }
+#endif
 
+#endif
 
 static BiosResult ReadWriteSectors (bool write, BiosLbaPacket &dapPacket, byte drive, const uint64 &sector, uint16 sectorCount, bool silent)
 {

src/Boot/Windows/Makefile

@@ -197,9 +197,9 @@ $(LIBS)
 	del $(PROJ).crf $(PROJ).crf2
 
 # Compress the Rescue Disk botloader for Cascades and Serpent since it is too big (size > 31232 bytes)
-!if DEFINED(RESCUE_DISK) && (!DEFINED (SINGLE_CIPHER) || ("$(SINGLE_CIPHER)" == "SERPENT") || ("$(SINGLE_CIPHER)" == "CAMELLIA"))
+#!if DEFINED(RESCUE_DISK) && (!DEFINED (SINGLE_CIPHER) || ("$(SINGLE_CIPHER)" == "SERPENT") || ("$(SINGLE_CIPHER)" == "CAMELLIA"))
 	upx $(PROJ).$(TARGETEXT)
-!endif
+#!endif
 	gzip.exe -c -n --best $(PROJ).$(TARGETEXT) >$(PROJ).$(TARGETEXT).gz
 	-dd.exe conv=notrunc,sync bs=512 seek=5 if=$(PROJ).$(TARGETEXT).gz of=$(PROJ).flp 2>NUL:
 	cd ..

src/Boot/Windows/Platform.cpp

@@ -137,6 +137,8 @@ bool operator<= (const uint64 &a, const uint64 &b)
 	return a < b || a == b;
 }
 
+#ifdef TC_BOOT_DEBUG_ENABLED
+
 bool TestInt64 ()
 {
 	uint64 a, b, c;
@@ -161,6 +163,7 @@ bool TestInt64 ()
 	return c.HighPart == 0x22446755UL && c.LowPart == 0x78024600UL;
 }
 
+#endif
 
 void CopyMemory (void *source, uint16 destSegment, uint16 destOffset, uint16 blockSize)
 {

src/Boot/Windows/Platform.h

@@ -110,7 +110,9 @@ void CopyMemory (uint16 sourceSegment, uint16 sourceOffset, void *destination, u
 extern "C" void EraseMemory (void *memory, int size);
 uint32 GetLinearAddress (uint16 segment, uint16 offset);
 bool RegionsIntersect (const uint64 &start1, uint32 length1, const uint64 &start2, const uint64 &end2);
+#ifdef TC_BOOT_DEBUG_ENABLED
 bool TestInt64 ();
+#endif
 extern "C" void ThrowFatalException (int line);
 
 #endif // TC_HEADER_Boot_Platform

src/Build/Resources/MacOSX/Info.plist.xml

@@ -74,7 +74,7 @@
 	<string>TRUE</string>
 
 	<key>CFBundleVersion</key>
-	<string>1.20.3</string>
+	<string>1.22.9</string>
 
 	<key>CFBundleShortVersionString</key>
 	<string>_VERSION_</string>

src/Build/build_veracrypt_freebsd.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# Copyright (c) 2013-2016 IDRIX
+# Governed by the Apache License 2.0 the full text of which is contained
+# in the file License.txt included in VeraCrypt binary and source
+# code distribution packages.
+#
+
+# Absolute path to this script
+SCRIPT=$(readlink -f "$0")
+# Absolute path this script is in
+SCRIPTPATH=$(dirname "$SCRIPT")
+# source directory which contains the Makefile
+SOURCEPATH=$(readlink -f "$SCRIPTPATH/..")
+# directory where the VeraCrypt has been checked out
+PARENTDIR=$(readlink -f "$SCRIPTPATH/../../..")
+
+# Make sure only root can run our script
+if [ "$(id -u)" != "0" ]; then
+   echo "VeraCrypt must be built by root" 1>&2
+   exit 1
+fi
+
+# the sources of wxWidgets 3.0.3 must be extracted to the parent directory
+export WX_ROOT=$PARENTDIR/wxWidgets-3.0.4
+echo "Using wxWidgets sources in $WX_ROOT"
+
+cd $SOURCEPATH
+
+echo "Building GUI version of VeraCrypt"
+
+# this will be the temporary wxWidgets directory
+export WX_BUILD_DIR=$PARENTDIR/wxBuildGui
+
+gmake WXSTATIC=1 wxbuild && gmake WXSTATIC=1 clean && gmake WXSTATIC=1 && gmake WXSTATIC=1 package
+
+# Uncomment below and comment line above to reuse existing wxWidgets build
+#gmake WXSTATIC=1 clean && gmake WXSTATIC=1 && gmake WXSTATIC=1 package
+
+echo "Building console version of VeraCrypt"
+
+# this will be the temporary wxWidgets directory
+export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole
+
+gmake WXSTATIC=1 NOGUI=1 wxbuild && gmake WXSTATIC=1 NOGUI=1 clean && gmake WXSTATIC=1 NOGUI=1 && gmake WXSTATIC=1 NOGUI=1 package
+
+# Uncomment below and comment line above to reuse existing wxWidgets build
+#gmake WXSTATIC=1 NOGUI=1 clean && gmake WXSTATIC=1 NOGUI=1 && gmake WXSTATIC=1 NOGUI=1 package

src/Build/build_veracrypt_linux.sh

@@ -21,7 +21,7 @@ if [ "$(id -u)" != "0" ]; then
 fi
 
 # the sources of wxWidgets 3.0.3 must be extracted to the parent directory
-export WX_ROOT=$PARENTDIR/wxWidgets-3.0.3
+export WX_ROOT=$PARENTDIR/wxWidgets-3.0.4
 echo "Using wxWidgets sources in $WX_ROOT"
 
 cd $SOURCEPATH

src/Build/build_veracrypt_macosx.sh

@@ -13,7 +13,7 @@ SOURCEPATH=$(cd "$(dirname "$SCRIPTPATH/../.")"; pwd)
 PARENTDIR=$(cd "$(dirname "$SCRIPTPATH/../../../.")"; pwd)
 
 # the sources of wxWidgets 3.0.3 must be extracted to the parent directory
-export WX_ROOT=$PARENTDIR/wxWidgets-3.0.3
+export WX_ROOT=$PARENTDIR/wxWidgets-3.0.4
 echo "Using wxWidgets sources in $WX_ROOT"
 
 # this will be the temporary wxWidgets directory

src/Common/Apidrvr.h

@@ -410,5 +410,7 @@ typedef struct
 #define TC_DRIVER_CONFIG_ENABLE_EXTENDED_IOCTL						0x10
 #define TC_DRIVER_CONFIG_DISABLE_EVIL_MAID_ATTACK_DETECTION			0x20
 #define TC_DRIVER_CONFIG_CACHE_BOOT_PIM								0x40
+#define VC_DRIVER_CONFIG_ALLOW_NONSYS_TRIM							0x80
+#define VC_DRIVER_CONFIG_BLOCK_SYS_TRIM								0x100
 
 #endif		/* _WIN32 */

src/Common/BootEncryption.cpp

@@ -530,7 +530,45 @@ namespace VeraCrypt
 			return bytesRead;
 		}
 
-		throw_sys_if (!ReadFile (Handle, buffer, size, &bytesRead, NULL));
+		if (!ReadFile (Handle, buffer, size, &bytesRead, NULL))
+		{
+			DWORD dwLastError = GetLastError();
+			if ((dwLastError == ERROR_INVALID_PARAMETER) && IsDevice && (size % 4096))
+			{					
+				DWORD remainingSize = (size % 4096);
+				DWORD alignedSize = size - remainingSize;
+				LARGE_INTEGER offset;
+
+				if (alignedSize)
+				{
+					if (ReadFile (Handle, buffer, alignedSize, &bytesRead, NULL))
+					{
+						if (bytesRead < alignedSize)
+							return bytesRead;
+
+						buffer += alignedSize;
+						size -= alignedSize;
+					}
+					else
+						throw SystemException (SRC_POS);
+				}
+
+
+				if (ReadFile (Handle, ReadBuffer, 4096, &bytesRead, NULL))
+				{
+					DWORD effectiveSize = min (bytesRead, remainingSize);					
+					memcpy (buffer, ReadBuffer, effectiveSize);
+					offset.QuadPart = - ((LONGLONG) bytesRead) + (LONGLONG) effectiveSize;
+					SetFilePointerEx (Handle, offset, NULL, FILE_CURRENT);
+					return alignedSize + effectiveSize;
+				}
+				else
+					throw SystemException (SRC_POS);
+			}
+			else
+				throw SystemException (SRC_POS);
+		}
+
 		return bytesRead;
 	}
 
@@ -600,7 +638,63 @@ namespace VeraCrypt
 			}
 			else
 			{
-				throw_sys_if (!WriteFile (Handle, buffer, size, &bytesWritten, NULL) || bytesWritten != size);
+				if (!WriteFile (Handle, buffer, size, &bytesWritten, NULL))
+				{
+					DWORD dwLastError = GetLastError ();
+					if ((ERROR_INVALID_PARAMETER == dwLastError) && IsDevice && !ReadOnly && (size % 4096))
+					{
+						bool bSuccess = false;						
+						DWORD remainingSize = (size % 4096);
+						DWORD alignedSize = size - remainingSize;
+						DWORD bytesRead = 0;
+						bytesWritten = 0;
+						if (alignedSize)
+						{
+							if (WriteFile (Handle, buffer, alignedSize, &bytesWritten, NULL))
+							{
+								throw_sys_if (bytesWritten != alignedSize);
+								buffer += alignedSize;
+								size -= alignedSize;
+							}
+							else
+							{
+								bytesWritten = 0;
+								dwLastError = GetLastError ();
+							}
+						}
+
+						if (!alignedSize || (alignedSize && bytesWritten))
+						{
+							LARGE_INTEGER offset;
+
+							throw_sys_if (!ReadFile (Handle, ReadBuffer, 4096, &bytesRead, NULL) || (bytesRead != 4096));
+							offset.QuadPart = -4096;
+							throw_sys_if (!SetFilePointerEx (Handle, offset, NULL, FILE_CURRENT));
+
+							memcpy (ReadBuffer, buffer, remainingSize);
+
+							if (WriteFile (Handle, ReadBuffer, 4096, &bytesWritten, NULL))
+							{
+								throw_sys_if (bytesWritten != 4096);
+								bSuccess = true;
+							}
+							else
+							{
+								dwLastError = GetLastError ();
+							}
+						}
+
+						if (!bSuccess)
+						{
+							SetLastError (dwLastError);
+							throw SystemException (SRC_POS);
+						}
+					}
+					else
+						throw SystemException (SRC_POS);
+				}
+				else
+					throw_sys_if (bytesWritten != size);				
 			}
 		}
 		catch (SystemException &e)
@@ -1845,7 +1939,7 @@ namespace VeraCrypt
 	NtQuerySystemInformationFn NtQuerySystemInformationPtr = NULL;
 
 	EfiBootConf::EfiBootConf() : passwordType (0),
-		passwordMsg ("Enter Password: "),
+		passwordMsg ("Password: "),
 		passwordPicture ("login.bmp"),
 		hashMsg ("(0) TEST ALL (1) SHA512 (2) WHIRLPOOL (3) SHA256 (4) RIPEMD160 (5) STREEBOG\nHash: "),
 		hashAlgo (0),
@@ -1962,7 +2056,7 @@ namespace VeraCrypt
 		char buffer[1024];
 
 		passwordType = ReadConfigInteger (configContent, "PasswordType", 0);
-		passwordMsg = ReadConfigString (configContent, "PasswordMsg", "Enter password: ", buffer, sizeof (buffer));
+		passwordMsg = ReadConfigString (configContent, "PasswordMsg", "Password: ", buffer, sizeof (buffer));
 		passwordPicture = ReadConfigString (configContent, "PasswordPicture", "\\EFI\\VeraCrypt\\login.bmp", buffer, sizeof (buffer));
 		//hashMsg = ReadConfigString (configContent, "HashMsg", "(0) TEST ALL (1) SHA512 (2) WHIRLPOOL (3) SHA256 (4) RIPEMD160 (5) STREEBOG\nHash: ", buffer, sizeof (buffer));
 		hashAlgo = ReadConfigInteger (configContent, "Hash", 0);
@@ -2128,13 +2222,16 @@ namespace VeraCrypt
 		GetVolumeESP(pathESP);
 		if (szFilePath[0] != L'\\')
 			pathESP += L"\\";
-		File f(pathESP + szFilePath, false, true);
+
 		fileContent.resize(dwSize);
 		if (bAddUTF8BOM)
 			memcpy (fileContent.data(), "\xEF\xBB\xBF", 3);
 		memcpy (&fileContent[dwOffset], pbData, dwDataLen);
+
+		File f(pathESP + szFilePath, false, true);
 		f.Write(fileContent.data(), dwSize);
 		f.Close();
+
 	}
 
 	EfiBoot::EfiBoot() {
@@ -2422,9 +2519,11 @@ namespace VeraCrypt
 	void EfiBoot::SaveFile(const wchar_t* name, byte* data, DWORD size) {
 		wstring path = EfiBootPartPath;
 		path += name;
+
 		File f(path, false, true);
 		f.Write(data, size);
 		f.Close();
+
 	}
 
 	void EfiBoot::GetFileSize(const wchar_t* name, unsigned __int64& size) {

src/Common/BootEncryption.h

@@ -58,6 +58,7 @@ namespace VeraCrypt
 		bool IsDevice;
 		wstring Path;
 		DWORD LastError;
+		BYTE ReadBuffer[4096];
 	};
 
 

src/Common/Common.h

@@ -23,6 +23,8 @@
 
 #define VOLUME_ID_SIZE	SHA256_DIGESTSIZE
 
+#define ALIGN_VALUE(value, alignment) (((alignment) == 0)? (value) : (((value) + ((alignment) - 1)) & ~((alignment) - 1)))
+
 typedef enum
 {
 	// IMPORTANT: If you add a new item here, update IsOSVersionAtLeast().

src/Common/Common.rc

@@ -7,7 +7,7 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include "afxres.h"
+#include "winres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -555,6 +555,7 @@ IDR_EFI_DCSCFG          BIN                     "..\\Boot\\EFI\\DcsCfg.efi"
 IDR_EFI_LEGACYSPEAKER   BIN                     "..\\Boot\\EFI\\LegacySpeaker.efi"
 IDR_EFI_DCSBML         BIN                     "..\\Boot\\EFI\\DcsBml.efi"
 IDR_EFI_DCSRE          BIN                     "..\\Boot\\EFI\\DcsRe.efi"
+IDR_EFI_DCSINFO         BIN                     "..\\Boot\\EFI\\DcsInfo.efi"
 #ifndef WIN64
 IDR_EFI_DCSBOOT32         BIN                     "..\\Boot\\EFI\\DcsBoot32.efi"
 IDR_EFI_DCSINT32          BIN                     "..\\Boot\\EFI\\DcsInt32.efi"
@@ -562,7 +563,6 @@ IDR_EFI_DCSCFG32          BIN                     "..\\Boot\\EFI\\DcsCfg32.efi"
 IDR_EFI_LEGACYSPEAKER32   BIN                     "..\\Boot\\EFI\\LegacySpeaker32.efi"
 IDR_EFI_DCSBML32         BIN                     "..\\Boot\\EFI\\DcsBml32.efi"
 IDR_EFI_DCSRE32          BIN                     "..\\Boot\\EFI\\DcsRe32.efi"
-IDR_EFI_DCSINFO         BIN                     "..\\Boot\\EFI\\DcsInfo.efi"
 IDR_EFI_DCSINFO32         BIN                     "..\\Boot\\EFI\\DcsInfo32.efi"
 #endif
 /////////////////////////////////////////////////////////////////////////////