Increment version to 1.16. Update user guide PDF file.

Translations/Language.ar.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="ar" name="العربية" en-name="Arabic" version="0.1.0" translators="Ahmad Gharbeia, Khaled Hosny" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="ar" key="IDC_HIDVOL_WIZ_MODE_FULL">‮الطور العادي</control>
     <control lang="ar" key="IDC_KB">&amp;KB</control>
     <control lang="ar" key="IDC_KEYFILES_ENABLE">‮ا&amp;ستخدم الملفات المفاتيح</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="ar" key="IDC_KEY_FILES">‮الملفات ال&amp;مفاتيح…</control>
     <control lang="ar" key="IDC_LINK_HASH_INFO">‮معلومات حوْل خوازميات التلبيد </control>
@@ -119,6 +120,7 @@
     <control lang="ar" key="IDC_CREATE">‮أنشئ</control>
     <control lang="ar" key="IDC_CREATE_VOLUME">‮أ&amp;نشئ مجلدا</control>
     <control lang="ar" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">‮لا &amp;تظهر أية نصوص في شاشة استيثاق ما قبل الإقلاع (ما عدا الرسالة المدخلة أدناه)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="ar" key="IDC_ENABLE_KEYFILES">‮استخدم الملفات المفاتيح</control>
     <control lang="ar" key="IDC_ENABLE_NEW_KEYFILES">‮استخدم الملفات المفاتيح</control>

Translations/Language.be.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="be" name="Беларуская" en-name="Belarusian" version="0.1.0" translators="Aleg Azarousky" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="be" key="IDC_HIDVOL_WIZ_MODE_FULL">Звычайны рэжым</control>
     <control lang="be" key="IDC_KB">&amp;Кб</control>
     <control lang="be" key="IDC_KEYFILES_ENABLE">Ключавыя файлы</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="be" key="IDC_KEY_FILES">Файлы...</control>
     <control lang="be" key="IDC_LINK_HASH_INFO">Звесткі пра хэш-алгарытмы</control>
@@ -119,6 +120,7 @@
     <control lang="be" key="IDC_CREATE">Стварыць</control>
     <control lang="be" key="IDC_CREATE_VOLUME">Стварыць том</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="be" key="IDC_ENABLE_KEYFILES">Выкарыстоўваць ключавыя файлы</control>
     <control lang="be" key="IDC_ENABLE_NEW_KEYFILES">Выкарыстоўваць ключавыя файлы</control>

Translations/Language.bg.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="bg" name="Български" en-name="Bulgarian" version="0.1.0" translators="Lachezar Gorchev" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="bg" key="IDC_HIDVOL_WIZ_MODE_FULL">Нормален режим</control>
     <control lang="bg" key="IDC_KB">&amp;KB</control>
     <control lang="bg" key="IDC_KEYFILES_ENABLE">&amp;Ключ-файлове</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="bg" key="IDC_KEY_FILES">&amp;Ключ-файлове..</control>
     <control lang="bg" key="IDC_LINK_HASH_INFO">Информация за хеш алгоритми</control>
@@ -119,6 +120,7 @@
     <control lang="bg" key="IDC_CREATE">Създаване</control>
     <control lang="bg" key="IDC_CREATE_VOLUME">&amp;Създаване на том</control>
     <control lang="bg" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Да не се &amp;показват никакви текстове в екрана за pre-boot автентикация (с изключение на по-долу зададеното съобщение)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="bg" key="IDC_ENABLE_KEYFILES">Ключ-файлове</control>
     <control lang="bg" key="IDC_ENABLE_NEW_KEYFILES">Ключ-файлове</control>

Translations/Language.ca.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="ca" name="Català" en-name="Catalan" version="0.1.0" translators="CESICAT, Centre de Seguretat de la Informació de Catalunya" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="ca" key="IDC_HIDVOL_WIZ_MODE_FULL">Mètode normal</control>
     <control lang="ca" key="IDC_KB">&amp;KB</control>
     <control lang="ca" key="IDC_KEYFILES_ENABLE">&amp;Usar fitxers de claus</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="ca" key="IDC_KEY_FILES">Fitxers de &amp;claus...</control>
     <control lang="ca" key="IDC_LINK_HASH_INFO">Més informació</control>
@@ -119,6 +120,7 @@
     <control lang="ca" key="IDC_CREATE">Crear</control>
     <control lang="ca" key="IDC_CREATE_VOLUME">C&amp;rear un volum</control>
     <control lang="ca" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">No &amp;mostris cap text a la pantalla d'autenticació abans d'arrencar (excepte el missatge personalitzat de sota)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="ca" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerar les operacions de xifratge fent servir les instruccions del processador (si és possible)</control>
     <control lang="ca" key="IDC_ENABLE_KEYFILES">Utilitzar fitxers de claus</control>
     <control lang="ca" key="IDC_ENABLE_NEW_KEYFILES">Utilitzar fitxers de claus</control>

Translations/Language.cs.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="cs" name="Čeština" en-name="Czech" version="1.0.0" translators="Vítek Moser" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="cs" key="IDC_HIDVOL_WIZ_MODE_FULL">Normální mód</control>
     <control lang="cs" key="IDC_KB">&amp;KB</control>
     <control lang="cs" key="IDC_KEYFILES_ENABLE">&amp;Použít souborové klíče</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="cs" key="IDC_KEY_FILES">Souborové &amp;klíče…</control>
     <control lang="cs" key="IDC_LINK_HASH_INFO">Informace o hash. algoritmech</control>
@@ -119,6 +120,7 @@
     <control lang="cs" key="IDC_CREATE">Vytvořit</control>
     <control lang="cs" key="IDC_CREATE_VOLUME">V&amp;ytvořit svazek</control>
     <control lang="cs" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">&amp;Nezobrazovat žádné texty na před-bootovací autentifikační obrazovce (kromě volitelného textu níže)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="cs" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Urychlit AES šifrování/dešifrování použitím AES instrukcí procesoru (jsou-li k dispozici)</control>
     <control lang="cs" key="IDC_ENABLE_KEYFILES">Použít soubor. klíče</control>
     <control lang="cs" key="IDC_ENABLE_NEW_KEYFILES">Použít soubor. klíče</control>

Translations/Language.da.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="da" name="Dansk" en-name="Danish" version="0.1.0" translators="Lasse Bond" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="da" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal tilstand</control>
     <control lang="da" key="IDC_KB">&amp;KB</control>
     <control lang="da" key="IDC_KEYFILES_ENABLE">Brug nøglef&amp;iler</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="da" key="IDC_KEY_FILES">Nøglefiler..</control>
     <control lang="da" key="IDC_LINK_HASH_INFO">Information om hakke algoritmer</control>
@@ -119,6 +120,7 @@
     <control lang="da" key="IDC_CREATE">Opret</control>
     <control lang="da" key="IDC_CREATE_VOLUME">&amp;Opret Bind</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="da" key="IDC_ENABLE_KEYFILES">Brug nøglef&amp;iler</control>
     <control lang="da" key="IDC_ENABLE_NEW_KEYFILES">Brug nøglef&amp;iler</control>

Translations/Language.de.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="de" name="Deutsch" en-name="German" version="1.1.0" translators="Harry Haller, Alexander Schorg, Simon Frankenberger, David Arndt, H. Sauer" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="de" key="IDC_HIDVOL_WIZ_MODE_FULL">Kompletter Modus</control>
     <control lang="de" key="IDC_KB">&amp;KB</control>
     <control lang="de" key="IDC_KEYFILES_ENABLE">Schlüsselda&amp;t. verwenden</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="de" key="IDC_KEYFILES_RANDOM_SIZE">Zufällige Größe ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="de" key="IDC_KEY_FILES">Schlüsselda&amp;teien…</control>
     <control lang="de" key="IDC_LINK_HASH_INFO">Infos über Hash-Algorithmen</control>
@@ -119,6 +120,7 @@
     <control lang="de" key="IDC_CREATE">Erstellen</control>
     <control lang="de" key="IDC_CREATE_VOLUME">Volume &amp;erstellen</control>
     <control lang="de" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Keine Texte im Pre-Boot Authentifikations-Bildschirm &amp;anzeigen (außer die unten definierte Nachricht)</control>
+    <control lang="de" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Deaktivieren Erkennung von "Evil Maid" Angriffe</control>
     <control lang="de" key="IDC_ENABLE_HARDWARE_ENCRYPTION">AES-Verschlüsselung durch Nutzung der AES-Befehle des Prozessors (falls unterstützt) beschleunigen</control>
     <control lang="de" key="IDC_ENABLE_KEYFILES">Sch&amp;lüsseldateien verw.</control>
     <control lang="de" key="IDC_ENABLE_NEW_KEYFILES">Schlüsselda&amp;teien verw.</control>

Translations/Language.el.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="el" name="Ελληνικά" en-name="Greek" version="0.1.0" translators="Βασίλης Κοσμίδης" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="el" key="IDC_HIDVOL_WIZ_MODE_FULL">Κανονική μέθοδος</control>
     <control lang="el" key="IDC_KB">&amp;KB</control>
     <control lang="el" key="IDC_KEYFILES_ENABLE">Χ&amp;ρήση αρχ.-κλειδιού</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="el" key="IDC_KEY_FILES">Αρ&amp;χεία-κλειδιά</control>
     <control lang="el" key="IDC_LINK_HASH_INFO">Πληροφορίες για αλγόριθμους hash</control>
@@ -119,6 +120,7 @@
     <control lang="el" key="IDC_CREATE">Δημιουργία</control>
     <control lang="el" key="IDC_CREATE_VOLUME">&amp;Δημιουργία τόμου</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="el" key="IDC_ENABLE_KEYFILES">Χρήση αρχ.-κλειδιών</control>
     <control lang="el" key="IDC_ENABLE_NEW_KEYFILES">Χρήση αρχ.-κλειδιών</control>

Translations/Language.es.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="es" name="Español" en-name="Spanish" version="1.0.0" translators="Juan Antonio Auñón Ochando" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="es" key="IDC_HIDVOL_WIZ_MODE_FULL">Modo Normal</control>
     <control lang="es" key="IDC_KB">&amp;KB</control>
     <control lang="es" key="IDC_KEYFILES_ENABLE">U&amp;sar archivo-llave</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="es" key="IDC_KEY_FILES">A&amp;rchivos-llave</control>
     <control lang="es" key="IDC_LINK_HASH_INFO">Información de algoritmos hash</control>
@@ -119,6 +120,7 @@
     <control lang="es" key="IDC_CREATE">Crear</control>
     <control lang="es" key="IDC_CREATE_VOLUME">&amp;Crear Volumen</control>
     <control lang="es" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">No mo&amp;strar texto en la pantalla de autenticación de pre-arranque (excepto el siguiente mensaje)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="es" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Acelerar cifrado/descifrado AES usando instrucciones AES del procesador (si es posible)</control>
     <control lang="es" key="IDC_ENABLE_KEYFILES">Usar Archivo-llave</control>
     <control lang="es" key="IDC_ENABLE_NEW_KEYFILES">Usar Archivo-llave</control>

Translations/Language.et.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="et" name="Eesti" en-name="Estonian" version="0.1.0" translators="Maiko Mõtsar" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="et" key="IDC_KB">&amp;KB</control>
     <control lang="et" key="IDC_KEYFILES_ENABLE">Kasuta võtmefaile</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="et" key="IDC_KEY_FILES">Võtmefailid..</control>
     <control lang="et" key="IDC_LINK_HASH_INFO">Informatsioon räsi algoritmide kohta</control>
@@ -119,6 +120,7 @@
     <control lang="et" key="IDC_CREATE">Loo</control>
     <control lang="et" key="IDC_CREATE_VOLUME">Loo konteiner</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="et" key="IDC_ENABLE_KEYFILES">Kasuta võtmefaile</control>
     <control lang="et" key="IDC_ENABLE_NEW_KEYFILES">Kasuta võtmefaile</control>

Translations/Language.eu.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="eu" name="Euskara" en-name="Basque" version="1.0.0" translators="Ander Genua" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="eu" key="IDC_HIDVOL_WIZ_MODE_FULL">Modu Normala</control>
     <control lang="eu" key="IDC_KB">&amp;KB</control>
     <control lang="eu" key="IDC_KEYFILES_ENABLE">Gako-artxiboa &amp;erabili</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="eu" key="IDC_KEY_FILES">&amp;Gako-artxiboa..</control>
     <control lang="eu" key="IDC_LINK_HASH_INFO">Hash algoritmoei buruzko informazioa</control>
@@ -119,6 +120,7 @@
     <control lang="eu" key="IDC_CREATE">Sortu</control>
     <control lang="eu" key="IDC_CREATE_VOLUME">&amp;Bolumena Sortu</control>
     <control lang="eu" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">&amp;Ez erakutsi inolako testurik hasieraketa aurreko kautotze pantailan (beheko mezu pertsonala izan ezik)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="eu" key="IDC_ENABLE_HARDWARE_ENCRYPTION">AES zifratze/argitze prozesua azeleratu prozesadorearen AES instrukzioak erabiliz (baldin badaude).</control>
     <control lang="eu" key="IDC_ENABLE_KEYFILES">Gako-fitxategiak erabili</control>
     <control lang="eu" key="IDC_ENABLE_NEW_KEYFILES">Gako-fitxategiak erabili</control>

Translations/Language.fa.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="fa" name="فارسي" en-name="Persian" version="0.1.0" translators="Ali Bitazar, Rodabeh Sarmadi" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="fa" key="IDC_KB">&amp;KB</control>
     <control lang="fa" key="IDC_KEYFILES_ENABLE">از كليدفايلها استفاده نماييد</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="fa" key="IDC_KEY_FILES">كليد فايلها ...</control>
     <control lang="en" key="IDC_LINK_HASH_INFO">Information on hash algorithms</control>
@@ -119,6 +120,7 @@
     <control lang="fa" key="IDC_CREATE">بساز</control>
     <control lang="fa" key="IDC_CREATE_VOLUME">&amp;ساخت پارتيشن</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="fa" key="IDC_ENABLE_KEYFILES">از كليد فايل استفاده كند</control>
     <control lang="fa" key="IDC_ENABLE_NEW_KEYFILES">از كليد فايل استفاده كند</control>

Translations/Language.fi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="fi" name="Suomi" en-name="Finnish" version="0.1.0" translators="Matti Ruhanen" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="fi" key="IDC_HIDVOL_WIZ_MODE_FULL">Normaalitila</control>
     <control lang="fi" key="IDC_KB">&amp;KB</control>
     <control lang="fi" key="IDC_KEYFILES_ENABLE">Käytä &amp;Avaintiedostoja</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="fi" key="IDC_KEY_FILES">&amp;Avaintiedostot..</control>
     <control lang="fi" key="IDC_LINK_HASH_INFO">Tietoa hash algoritmeista</control>
@@ -119,6 +120,7 @@
     <control lang="fi" key="IDC_CREATE">Luo</control>
     <control lang="fi" key="IDC_CREATE_VOLUME">L&amp;uo Taltio</control>
     <control lang="fi" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">älä &amp;näytä tekstiä esikäynnistys autentikointi ikkunassa (paitsi alapuolinen käyttäjän viesti)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="fi" key="IDC_ENABLE_KEYFILES">Käytä Avaintiedostoa</control>
     <control lang="fi" key="IDC_ENABLE_NEW_KEYFILES">Käytä Avaintiedostoa</control>

Translations/Language.fr.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="fr" name="Français" en-name="French" version="0.3.0" translators="Stéphane S., Olivier M., Thierry T" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="fr" key="IDC_HIDVOL_WIZ_MODE_FULL">Mode normal</control>
     <control lang="fr" key="IDC_KB">&amp;Ko</control>
     <control lang="fr" key="IDC_KEYFILES_ENABLE">&amp;Utiliser fichiers clés</control>
+    <control lang="fr" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Essayer d'abords de monter avec un mot de passe vide</control>
     <control lang="fr" key="IDC_KEYFILES_RANDOM_SIZE">Taille aléatoire ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="fr" key="IDC_KEY_FILES">&amp;Fichiers clés...</control>
     <control lang="fr" key="IDC_LINK_HASH_INFO">Infos : algorithmes de hachage</control>
@@ -119,6 +120,7 @@
     <control lang="fr" key="IDC_CREATE">Créer</control>
     <control lang="fr" key="IDC_CREATE_VOLUME">Créer un volume</control>
     <control lang="fr" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Ne &amp;montrer aucun texte dans l'écran d'authentification de pré-amorçage (excepté le message ci-dessous)</control>
+    <control lang="fr" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Désactiver la détection des attaques de type "Evil Maid"</control>
     <control lang="fr" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accélérer le chiffrement/déchiffrement AES en utilisant les instructions AES du processeur (si disponible)</control>
     <control lang="fr" key="IDC_ENABLE_KEYFILES">Fichiers clés</control>
     <control lang="fr" key="IDC_ENABLE_NEW_KEYFILES">Fichiers clés</control>

Translations/Language.hu.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="hu" name="Magyar" en-name="Hungarian" version="0.1.0" translators="Nyul Balazs" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="hu" key="IDC_KB">&amp;KB</control>
     <control lang="en" key="IDC_KEYFILES_ENABLE">U&amp;se keyfiles</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="en" key="IDC_KEY_FILES">&amp;Keyfiles...</control>
     <control lang="en" key="IDC_LINK_HASH_INFO">Information on hash algorithms</control>
@@ -119,6 +120,7 @@
     <control lang="hu" key="IDC_CREATE">Létrehoz</control>
     <control lang="hu" key="IDC_CREATE_VOLUME">&amp;Kötet létrehozása</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="hu" key="IDC_ENABLE_KEYFILES">Kulcsfájlok használata</control>
     <control lang="hu" key="IDC_ENABLE_NEW_KEYFILES">Kulcsfájlok használata</control>

Translations/Language.id.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="id" name="Bahasa Indonesia" en-name="Indonesian" version="0.1.0" translators="Tajuddin N. F." />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="id" key="IDC_KB">&amp;KB</control>
     <control lang="id" key="IDC_KEYFILES_ENABLE">Gu&amp;nakan file kunci</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="id" key="IDC_KEY_FILES">&amp;File kunci..</control>
     <control lang="en" key="IDC_LINK_HASH_INFO">Information on hash algorithms</control>
@@ -119,6 +120,7 @@
     <control lang="id" key="IDC_CREATE">Buat</control>
     <control lang="id" key="IDC_CREATE_VOLUME">&amp;Buat Volume Baru</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="id" key="IDC_ENABLE_KEYFILES">Gunakan file kunci</control>
     <control lang="id" key="IDC_ENABLE_NEW_KEYFILES">Gunakan file kunci baru</control>

Translations/Language.it.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="it" name="Italiano" en-name="Italian" version="1.0.1" translators="Maurizio Ballo, Consiglio Gaetano" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="it" key="IDC_HIDVOL_WIZ_MODE_FULL">Modo normale</control>
     <control lang="it" key="IDC_KB">KB</control>
     <control lang="it" key="IDC_KEYFILES_ENABLE">Usa file chiave</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="it" key="IDC_KEY_FILES">File chiave...</control>
     <control lang="it" key="IDC_LINK_HASH_INFO">Info sugli algoritmi confusione</control>
@@ -119,6 +120,7 @@
     <control lang="it" key="IDC_CREATE">Crea</control>
     <control lang="it" key="IDC_CREATE_VOLUME">Crea un volume...</control>
     <control lang="it" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Non &amp;mostrare nessun testo nello schermo autenticazione di pre-boot(eccetto il messaggio utente in basso)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="it" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelera la codifica/decodifica AES usando le istruzioni AES del processore (se disponibili)</control>
     <control lang="it" key="IDC_ENABLE_KEYFILES">Usa file chiave</control>
     <control lang="it" key="IDC_ENABLE_NEW_KEYFILES">Usa file chiave</control>

Translations/Language.ja.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="ja" name="日本語" en-name="Japanese" version="1.0.0" translators="OGOSHI Masayuki" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="ja" key="IDC_HIDVOL_WIZ_MODE_FULL">通常モード</control>
     <control lang="ja" key="IDC_KB">&amp;KB</control>
     <control lang="ja" key="IDC_KEYFILES_ENABLE">キーファイルを使用(&amp;S)</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="ja" key="IDC_KEY_FILES">キーファイル(&amp;K)</control>
     <control lang="ja" key="IDC_LINK_HASH_INFO">ハッシュアルゴリズムについて</control>
@@ -119,6 +120,7 @@
     <control lang="ja" key="IDC_CREATE">作成</control>
     <control lang="ja" key="IDC_CREATE_VOLUME">ボリュームの作成(&amp;C)</control>
     <control lang="ja" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">起動前認証画面で一切の文字を表示しない(以下のカスタムメッセージを除く)(&amp;s)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="ja" key="IDC_ENABLE_HARDWARE_ENCRYPTION">可能ならCPUのAES処理命令セットを利用してAESによる暗号化/復号処理を高速化する</control>
     <control lang="ja" key="IDC_ENABLE_KEYFILES">キーファイルを使用</control>
     <control lang="ja" key="IDC_ENABLE_NEW_KEYFILES">キーファイルを使用</control>

Translations/Language.ka.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="ka" name="ქართული" en-name="Georgian" version="0.1.0" translators="Kakha Lomiashvili" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="ka" key="IDC_HIDVOL_WIZ_MODE_FULL">ნორმალური რეჟიმი</control>
     <control lang="ka" key="IDC_KB">კბ</control>
     <control lang="ka" key="IDC_KEYFILES_ENABLE">გასაღების ფაილები</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="ka" key="IDC_KEY_FILES">ფაილები</control>
     <control lang="ka" key="IDC_LINK_HASH_INFO">ჰეშ-ალგორითმების შესახებ</control>
@@ -119,6 +120,7 @@
     <control lang="ka" key="IDC_CREATE">შექმნა</control>
     <control lang="ka" key="IDC_CREATE_VOLUME">ტომის შექმნა</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="ka" key="IDC_ENABLE_KEYFILES">გასაღების ფაილები</control>
     <control lang="ka" key="IDC_ENABLE_NEW_KEYFILES">გასაღების ფაილები</control>

Translations/Language.ko.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="ko" name="한국어" en-name="Korean" version="0.1.0" translators="Kim Young" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="ko" key="IDC_HIDVOL_WIZ_MODE_FULL">표준 방식</control>
     <control lang="ko" key="IDC_KB">KB(&amp;K)</control>
     <control lang="ko" key="IDC_KEYFILES_ENABLE">키파일 사용(&amp;S)</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="ko" key="IDC_KEY_FILES">키파일(&amp;K)...</control>
     <control lang="ko" key="IDC_LINK_HASH_INFO">해시 알고리듬에 대한 정보</control>
@@ -119,6 +120,7 @@
     <control lang="ko" key="IDC_CREATE">만들기</control>
     <control lang="ko" key="IDC_CREATE_VOLUME">볼륨 만들기(&amp;C)</control>
     <control lang="ko" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">부팅-전 인증 화면에 어떠한 텍스트도 표시 안함(* 하단의 사용자 메시지는 제외)(&amp;S)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="ko" key="IDC_ENABLE_KEYFILES">키파일 사용</control>
     <control lang="ko" key="IDC_ENABLE_NEW_KEYFILES">키파일 사용</control>

Translations/Language.lv.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="lv" name="Latviešu" en-name="Latvian" version="0.1.0" translators="Edmunds Melkers" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="lv" key="IDC_KB">&amp;KB</control>
     <control lang="en" key="IDC_KEYFILES_ENABLE">U&amp;se keyfiles</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="en" key="IDC_KEY_FILES">&amp;Keyfiles...</control>
     <control lang="en" key="IDC_LINK_HASH_INFO">Information on hash algorithms</control>
@@ -119,6 +120,7 @@
     <control lang="lv" key="IDC_CREATE">Izveidot</control>
     <control lang="lv" key="IDC_CREATE_VOLUME">Izveidot apgabalu</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="lv" key="IDC_ENABLE_KEYFILES">Lietot atslēgdatnes</control>
     <control lang="lv" key="IDC_ENABLE_NEW_KEYFILES">Lietot atslēgdatnes</control>

Translations/Language.my.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="my" name="မြန်မာ" en-name="Burmese" version="1.0.0" translators="Zaw Myo Htet" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="my" key="IDC_HIDVOL_WIZ_MODE_FULL">ပုံမှန် နည်းစနစ်</control>
     <control lang="my" key="IDC_KB">&amp;KB</control>
     <control lang="my" key="IDC_KEYFILES_ENABLE">ကီးဖိုင်ကို သုံးရန်</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="my" key="IDC_KEY_FILES">ကီးဖိုင်များ...</control>
     <control lang="my" key="IDC_LINK_HASH_INFO">H​ash အယ်လဂိုရီသမ်များ၏ အချက်အလက်များ</control>
@@ -119,6 +120,7 @@
     <control lang="my" key="IDC_CREATE">ဖန်တီးရန်</control>
     <control lang="my" key="IDC_CREATE_VOLUME">Volume ဖန်တီးရန်</control>
     <control lang="my" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">စက်မတက်မီ စစ်ဆေးမှုပြ မျက်နှာပြင်တွင် မည်သည့်စာသားမျှ မပြပါနှင့်(အောက်ဖေါ်ပြပါ စိတ်ကြိုက် စာတမ်းမှ လွဲ၍)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="my" key="IDC_ENABLE_HARDWARE_ENCRYPTION">ပရိုဆက်ဆာ၏ AES လမ်းညွှန်မှုကိုအသုံးပြု၍ AES ဝှက်စာခြင်း/စာဝှက်ဖေါ်ခြင်းကို အရိုန်မြှင့်ပါ (အကယ်၍ ရနိုင်ပါက)</control>
     <control lang="my" key="IDC_ENABLE_KEYFILES">ကီးဖိုင် သုံးရန်</control>
     <control lang="my" key="IDC_ENABLE_NEW_KEYFILES">ကီးဖိုင် သုံးရန်</control>

Translations/Language.nl.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="nl" name="Nederlands" en-name="Dutch" version="0.1.0" translators="Jan van der Wal" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="nl" key="IDC_HIDVOL_WIZ_MODE_FULL">Normale modus</control>
     <control lang="nl" key="IDC_KB">&amp;KB</control>
     <control lang="nl" key="IDC_KEYFILES_ENABLE">G&amp;ebruik Sleutel Best.</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="nl" key="IDC_KEY_FILES">&amp;Sleutelbestanden</control>
     <control lang="nl" key="IDC_LINK_HASH_INFO">Informatie over hash algoritmes</control>
@@ -119,6 +120,7 @@
     <control lang="nl" key="IDC_CREATE">Maak aan</control>
     <control lang="nl" key="IDC_CREATE_VOLUME">Maa&amp;k Volume</control>
     <control lang="nl" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Laat geen &amp;tekst zien in het pre-boot authenticatie scherm (behalve de onderstaande aangepaste boodschap)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="nl" key="IDC_ENABLE_KEYFILES">Gebruik Sleutel Best.</control>
     <control lang="nl" key="IDC_ENABLE_NEW_KEYFILES">Gebruik Sleutel Best.</control>

Translations/Language.nn.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="nn" name="Norsk Nynorsk" en-name="Norwegian (Nynorsk)" version="0.1.0" translators="Kjell Rune Helland" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="nn" key="IDC_KB">&amp;KB</control>
     <control lang="nn" key="IDC_KEYFILES_ENABLE">U&amp;Bruk nøkkelfiler</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="nn" key="IDC_KEY_FILES">Nø&amp;kkelfiler..</control>
     <control lang="nn" key="IDC_LINK_HASH_INFO">Informasjon om hash algoritmar</control>
@@ -119,6 +120,7 @@
     <control lang="nn" key="IDC_CREATE">Opprett</control>
     <control lang="nn" key="IDC_CREATE_VOLUME">&amp;Opprett Volum</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="nn" key="IDC_ENABLE_KEYFILES">Bruk nøkkelfiler</control>
     <control lang="nn" key="IDC_ENABLE_NEW_KEYFILES">Bruk nøkkelfiler</control>

Translations/Language.pl.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="pl" name="Polski" en-name="Polish" version="1.0.0" translators="Mirek Druchowicz, Janusz Zamecki, Sobiesław Antolak, Begina Felicysym" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="pl" key="IDC_HIDVOL_WIZ_MODE_FULL">Tryb zwykły</control>
     <control lang="pl" key="IDC_KB">&amp;kB</control>
     <control lang="pl" key="IDC_KEYFILES_ENABLE">Użyj plików-&amp;kluczy</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="pl" key="IDC_KEYFILES_RANDOM_SIZE">Losowy rozmiar ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="pl" key="IDC_KEY_FILES">Pliki-kl&amp;ucze...</control>
     <control lang="pl" key="IDC_LINK_HASH_INFO">Informacja o algorytmach mieszających</control>
@@ -119,6 +120,7 @@
     <control lang="pl" key="IDC_CREATE">Utwórz</control>
     <control lang="pl" key="IDC_CREATE_VOLUME">&amp;Utwórz wolumen</control>
     <control lang="pl" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Nie wyś&amp;wietlaj żadnego tekstu podczas autoryzacji przy starcie (z wyjątkiem poniższego tekstu)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="pl" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Przyspiesz szyfrowanie/deszyfrowanie AES przy użyciu instrukcji AES procesora (jeśli dostępne)</control>
     <control lang="pl" key="IDC_ENABLE_KEYFILES">Użyj plików-kluczy</control>
     <control lang="pl" key="IDC_ENABLE_NEW_KEYFILES">Użyj nowych plików-kluczy</control>

Translations/Language.pt-br.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="pt-br" name="Português-Brasil" en-name="Portuguese (Brazil)" version="0.1.0" translators="Thiago C. L. Mendes, Lecidio S. Alencar , Lucas C. Ferreira" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="pt-br" key="IDC_HIDVOL_WIZ_MODE_FULL">Modo normal</control>
     <control lang="pt-br" key="IDC_KB">&amp;KB</control>
     <control lang="pt-br" key="IDC_KEYFILES_ENABLE">U&amp;sar arquivos-chave</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="pt-br" key="IDC_KEY_FILES">&amp;Arquivos-chave...</control>
     <control lang="pt-br" key="IDC_LINK_HASH_INFO">Informação sobre algoritmos hash</control>
@@ -119,6 +120,7 @@
     <control lang="pt-br" key="IDC_CREATE">Criar</control>
     <control lang="pt-br" key="IDC_CREATE_VOLUME">&amp;Criar Volume</control>
     <control lang="pt-br" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Não mo&amp;strar quaisquer textos na tela de autenticação pré-boot (exceto a mensagem personalizada abaixo)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="pt-br" key="IDC_ENABLE_KEYFILES">Usar arquivos-chave</control>
     <control lang="pt-br" key="IDC_ENABLE_NEW_KEYFILES">Usar arquivos-chave</control>

Translations/Language.ru.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="ru" name="Русский" en-name="Russian" version="1.0.0" translators="Dmitry Yerokhin" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="ru" key="IDC_HIDVOL_WIZ_MODE_FULL">Обычный режим</control>
     <control lang="ru" key="IDC_KB">&amp;КБ</control>
     <control lang="ru" key="IDC_KEYFILES_ENABLE">Кл&amp;юч. файлы</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="ru" key="IDC_KEYFILES_RANDOM_SIZE">Случайный размер ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="ru" key="IDC_KEY_FILES">Клю&amp;ч. файлы...</control>
     <control lang="ru" key="IDC_LINK_HASH_INFO">Сведения о хеш-алгоритмах</control>
@@ -119,6 +120,7 @@
     <control lang="ru" key="IDC_CREATE">Создать</control>
     <control lang="ru" key="IDC_CREATE_VOLUME">С&amp;оздать том</control>
     <control lang="ru" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Пусто&amp;й экран аутентификации (только указанный ниже текст)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="ru" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Ускорять (де)шифрование AES с помощью AES-инструкций процессора (если возможно)</control>
     <control lang="ru" key="IDC_ENABLE_KEYFILES">Ключ. файлы</control>
     <control lang="ru" key="IDC_ENABLE_NEW_KEYFILES">Ключ. файлы</control>

Translations/Language.sk.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="sk" name="Slovenčina" en-name="Slovak" version="0.1.0" translators="Kamil David" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="sk" key="IDC_KB">&amp;KB</control>
     <control lang="sk" key="IDC_KEYFILES_ENABLE">&amp;Použiť súborové kľúče</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="sk" key="IDC_KEY_FILES">Súborové &amp;kľúče...</control>
     <control lang="sk" key="IDC_LINK_HASH_INFO">Informácie o hash. algoritmoch</control>
@@ -119,6 +120,7 @@
     <control lang="sk" key="IDC_CREATE">Vytvoriť</control>
     <control lang="sk" key="IDC_CREATE_VOLUME">V&amp;ytvoriť zväzok</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="sk" key="IDC_ENABLE_KEYFILES">Použiť súbor. kľúče</control>
     <control lang="sk" key="IDC_ENABLE_NEW_KEYFILES">Použiť súbor. kľúče</control>

Translations/Language.sl.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="sl" name="Slovenščina" en-name="Slovenian" version="0.1.0" translators="Erik David Salam" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="sl" key="IDC_HIDVOL_WIZ_MODE_FULL">Običajen način</control>
     <control lang="en" key="IDC_KB">&amp;KB</control>
     <control lang="sl" key="IDC_KEYFILES_ENABLE">&amp;Uporabi ključne dat.</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="sl" key="IDC_KEY_FILES">&amp;Ključne dat. ...</control>
     <control lang="sl" key="IDC_LINK_HASH_INFO">Informacije o razpršil. algor.</control>
@@ -119,6 +120,7 @@
     <control lang="sl" key="IDC_CREATE">Ustvari</control>
     <control lang="sl" key="IDC_CREATE_VOLUME">&amp;Ustvari zbirnik</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="sl" key="IDC_ENABLE_KEYFILES">Uporabi ključne dat.</control>
     <control lang="sl" key="IDC_ENABLE_NEW_KEYFILES">Uporabi ključne dat.</control>

Translations/Language.sv.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="sv" name="Svenska" en-name="Swedish" version="1.0.0" translators="Peter Runesson" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="sv" key="IDC_HIDVOL_WIZ_MODE_FULL">N&amp;ormalläge</control>
     <control lang="sv" key="IDC_KB">&amp;kB</control>
     <control lang="sv" key="IDC_KEYFILES_ENABLE">&amp;Använd nyckelfiler</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="sv" key="IDC_KEY_FILES">N&amp;yckelfiler …</control>
     <control lang="sv" key="IDC_LINK_HASH_INFO">Information om hashalgoritmer</control>
@@ -119,6 +120,7 @@
     <control lang="sv" key="IDC_CREATE">Skapa</control>
     <control lang="sv" key="IDC_CREATE_VOLUME">S&amp;kapa volym</control>
     <control lang="sv" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">&amp;Visa inte någon text vid förstartsautentiseringen (förutom det anpassade meddelandet)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="sv" key="IDC_ENABLE_HARDWARE_ENCRYPTION">&amp;Snabba upp AES-kryptering och -dekryptering genom att använda processorns AES-instruktioner</control>
     <control lang="sv" key="IDC_ENABLE_KEYFILES">&amp;Använd nyckelfiler</control>
     <control lang="sv" key="IDC_ENABLE_NEW_KEYFILES">A&amp;nvänd nyckelfiler</control>

Translations/Language.tr.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="tr" name="Türkçe" en-name="Turkish" version="0.1.0" translators="Ali İskender Turan, Zeynel Abidin Öztürk" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="tr" key="IDC_KB">&amp;KB</control>
     <control lang="tr" key="IDC_KEYFILES_ENABLE">Anah&amp;tar dosya kullan</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="tr" key="IDC_KEY_FILES">&amp;Anahtar Dosyalar</control>
     <control lang="tr" key="IDC_LINK_HASH_INFO">Karma algoritmaları hakkında bilgi</control>
@@ -119,6 +120,7 @@
     <control lang="tr" key="IDC_CREATE">Oluştur</control>
     <control lang="tr" key="IDC_CREATE_VOLUME">Birim Oluş&amp;tur</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="tr" key="IDC_ENABLE_KEYFILES">Anahtar dosya kullan</control>
     <control lang="tr" key="IDC_ENABLE_NEW_KEYFILES">Anahtar dosya kullan</control>

Translations/Language.uk.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="uk" name="Українська" en-name="Ukrainian" version="1.0.0" translators="Kravchuk Olexandr, Babchuk Volodymyr" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="uk" key="IDC_HIDVOL_WIZ_MODE_FULL">Звичайний режим</control>
     <control lang="uk" key="IDC_KB">&amp;Кб</control>
     <control lang="uk" key="IDC_KEYFILES_ENABLE">Кл&amp;юч. файли</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="uk" key="IDC_KEY_FILES">Клю&amp;ч. файли...</control>
     <control lang="uk" key="IDC_LINK_HASH_INFO">Свідчення про хеш-алгоритмах</control>
@@ -119,6 +120,7 @@
     <control lang="uk" key="IDC_CREATE">Створити</control>
     <control lang="uk" key="IDC_CREATE_VOLUME">&amp;Створити том</control>
     <control lang="uk" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Не відображати текст на &amp;екрані футентифікації (за винятком нижче вказаного тексту)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="uk" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Пришвидшення AES шифрування/дешифрування з використанням AES інструкцій процесора (якщо є)</control>
     <control lang="uk" key="IDC_ENABLE_KEYFILES">Використовувати файл-ключі</control>
     <control lang="uk" key="IDC_ENABLE_NEW_KEYFILES">Використовувати файл-ключі</control>

Translations/Language.uz.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="uz" name="Ўзбекча" en-name="Uzbek (Cyrillic)" version="0.1.0" translators="Abdurauf Azizov, Dmitry Yerokhin" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="uz" key="IDC_HIDVOL_WIZ_MODE_FULL">Оддий режим</control>
     <control lang="uz" key="IDC_KB">&amp;Кб</control>
     <control lang="uz" key="IDC_KEYFILES_ENABLE">Ка&amp;лит. файллар</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="uz" key="IDC_KEY_FILES">Ка&amp;лит. файллар...</control>
     <control lang="uz" key="IDC_LINK_HASH_INFO">Хэш-алгоритмлар буйича маълумотлар</control>
@@ -119,6 +120,7 @@
     <control lang="uz" key="IDC_CREATE">Создать</control>
     <control lang="uz" key="IDC_CREATE_VOLUME">&amp;Том(файл) яратиш</control>
     <control lang="uz" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Ни&amp;чего не показывать на экране авторизации (кроме указанного ниже текста)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="uz" key="IDC_ENABLE_KEYFILES">Ключ. файлы</control>
     <control lang="uz" key="IDC_ENABLE_NEW_KEYFILES">Ключ. файлы</control>

Translations/Language.vi.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="vi" name="Tiếng Việt" en-name="Vietnamese" version="0.1.0" translators="Nguyễn Kim Huy" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="vi" key="IDC_HIDVOL_WIZ_MODE_FULL">Phương thức thông thường</control>
     <control lang="vi" key="IDC_KB">&amp;KB</control>
     <control lang="vi" key="IDC_KEYFILES_ENABLE">X&amp;ử dụng tập tin khóa</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="vi" key="IDC_KEY_FILES">&amp;Tập tin khóa..</control>
     <control lang="vi" key="IDC_LINK_HASH_INFO">Thông tin về các thuật toán ước tính</control>
@@ -119,6 +120,7 @@
     <control lang="vi" key="IDC_CREATE">Cấu tạo</control>
     <control lang="vi" key="IDC_CREATE_VOLUME">Cấu tạo Tập đĩa</control>
     <control lang="vi" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Đừng cho thấy bất cứ văn bản nào trong màn ảnh chứng thực tiền khởi động (ngoại trừ thông điệp riêng bên dưới)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="vi" key="IDC_ENABLE_KEYFILES">Xử dụng tập tin khóa</control>
     <control lang="vi" key="IDC_ENABLE_NEW_KEYFILES">Xử dụng tập tin khóa</control>

Translations/Language.zh-cn.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="zh-cn" name="简体中文" en-name="Chinese (Simplified)" version="1.0.0" translators="Barney Li" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="zh-cn" key="IDC_HIDVOL_WIZ_MODE_FULL">常规模式</control>
     <control lang="zh-cn" key="IDC_KB">KB(&amp;K)</control>
     <control lang="zh-cn" key="IDC_KEYFILES_ENABLE">使用密钥文件(&amp;S)</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="zh-cn" key="IDC_KEY_FILES">密钥文件(&amp;K)..</control>
     <control lang="zh-cn" key="IDC_LINK_HASH_INFO">混杂算法的更多信息（联网）</control>
@@ -119,6 +120,7 @@
     <control lang="zh-cn" key="IDC_CREATE">创建</control>
     <control lang="zh-cn" key="IDC_CREATE_VOLUME">创建加密卷(&amp;C)</control>
     <control lang="zh-cn" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">在启动验证屏幕不显示任何文本（仅显示下面自定义的信息）(&amp;S)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="zh-cn" key="IDC_ENABLE_HARDWARE_ENCRYPTION">使用处理器指令加速 AES 加解密（如果功能可用）</control>
     <control lang="zh-cn" key="IDC_ENABLE_KEYFILES">使用密钥文件</control>
     <control lang="zh-cn" key="IDC_ENABLE_NEW_KEYFILES">使用密钥文件</control>

Translations/Language.zh-hk.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="zh-hk" name="繁體中文" en-name="Chinese (Hong Kong)" version="0.1.0" translators="PUN Chi Ho" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="zh-hk" key="IDC_HIDVOL_WIZ_MODE_FULL">常規模式</control>
     <control lang="zh-hk" key="IDC_KB">KB(&amp;K)</control>
     <control lang="zh-hk" key="IDC_KEYFILES_ENABLE">使用密鑰檔(&amp;S)</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="zh-hk" key="IDC_KEY_FILES">密鑰文件(&amp;K)..</control>
     <control lang="zh-hk" key="IDC_LINK_HASH_INFO">關於混雜演算法的更多資訊（聯網）</control>
@@ -119,6 +120,7 @@
     <control lang="zh-hk" key="IDC_CREATE">創建</control>
     <control lang="zh-hk" key="IDC_CREATE_VOLUME">創建加密卷(&amp;C)</control>
     <control lang="zh-hk" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">在啟動驗證螢幕不顯示任何文本（僅顯示下面自定義的資訊）(&amp;S)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="zh-hk" key="IDC_ENABLE_HARDWARE_ENCRYPTION">使用處理器指令加速 AES 加解密（如果功能可用）</control>
     <control lang="zh-hk" key="IDC_ENABLE_KEYFILES">使用密鑰檔</control>
     <control lang="zh-hk" key="IDC_ENABLE_NEW_KEYFILES">使用密鑰檔</control>

Translations/Language.zh-tw.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <VeraCrypt>
-  <localization prog-version="1.15">
+  <localization prog-version="1.16">
     <!-- Languages -->
     <language langid="zh-tw" name="繁體中文" en-name="Chinese (Taiwan)" version="0.1.0" translators="Barney Li, Simon Ma, ChangMing Hsu" />
     <!-- Fonts -->
@@ -45,6 +45,7 @@
     <control lang="zh-tw" key="IDC_HIDVOL_WIZ_MODE_FULL">正常模式</control>
     <control lang="zh-tw" key="IDC_KB">KB(&amp;K)</control>
     <control lang="zh-tw" key="IDC_KEYFILES_ENABLE">使用金鑰檔(&amp;S)</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="zh-tw" key="IDC_KEY_FILES">金鑰檔案(&amp;K)...</control>
     <control lang="zh-tw" key="IDC_LINK_HASH_INFO">關於雜湊演算法的更多資訊</control>
@@ -117,6 +118,7 @@
     <control lang="zh-tw" key="IDC_CREATE">建立</control>
     <control lang="zh-tw" key="IDC_CREATE_VOLUME">建立加密區(&amp;C)</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="zh-tw" key="IDC_ENABLE_KEYFILES">使用金鑰檔</control>
     <control lang="zh-tw" key="IDC_ENABLE_NEW_KEYFILES">使用金鑰檔</control>

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

@@ -27,7 +27,7 @@
 	<string>TRUE</string>
 
 	<key>CFBundleVersion</key>
-	<string>1.15.6</string>
+	<string>1.16.1</string>
 
 	<key>CFBundleShortVersionString</key>
 	<string>_VERSION_</string>

src/Common/Apidrvr.h

@@ -322,7 +322,8 @@ typedef struct
 
 #define NT_MOUNT_PREFIX DRIVER_STR("\\Device\\VeraCryptVolume")
 #define NT_ROOT_PREFIX DRIVER_STR("\\Device\\VeraCrypt")
-#define DOS_MOUNT_PREFIX DRIVER_STR("\\GLOBAL??\\") // Explicitely use Global MS-DOS device names to avoid security issues
+#define DOS_MOUNT_PREFIX_DEFAULT DRIVER_STR("\\DosDevices\\")
+#define DOS_MOUNT_PREFIX_GLOBAL DRIVER_STR("\\GLOBAL??\\") // Use Global MS-DOS device names for sanity checks on drive letters
 #define DOS_ROOT_PREFIX DRIVER_STR("\\DosDevices\\VeraCrypt")
 #define WIN32_ROOT_PREFIX DRIVER_STR("\\\\.\\VeraCrypt")
 
@@ -335,5 +336,6 @@ typedef struct
 #define TC_DRIVER_CONFIG_DISABLE_NONADMIN_SYS_FAVORITES_ACCESS		0x4
 #define TC_DRIVER_CONFIG_DISABLE_HARDWARE_ENCRYPTION				0x8
 #define TC_DRIVER_CONFIG_ENABLE_EXTENDED_IOCTL						0x10
+#define TC_DRIVER_CONFIG_DISABLE_EVIL_MAID_ATTACK_DETECTION			0x20
 
 #endif		/* _WIN32 */

src/Common/Common.rc

@@ -98,7 +98,7 @@ BEGIN
     EDITTEXT        IDC_VOLUME_LABEL,112,67,150,14,ES_AUTOHSCROLL
 END
 
-IDD_KEYFILES DIALOGEX 0, 0, 345, 237
+IDD_KEYFILES DIALOGEX 0, 0, 345, 251
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "VeraCrypt - Keyfiles"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -109,15 +109,17 @@ BEGIN
     PUSHBUTTON      "Add &Token Files...",IDC_TOKEN_FILES_ADD,139,132,65,14
     PUSHBUTTON      "&Remove",IDC_KEYREMOVE,209,132,61,14
     PUSHBUTTON      "Remove &All",IDC_KEYREMOVEALL,275,132,61,14
-    CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,219,83,11
+    CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,232,83,11
-    PUSHBUTTON      "&Generate Random Keyfile...",IDC_GENERATE_KEYFILE,213,217,123,14
+    PUSHBUTTON      "&Generate Random Keyfile...",IDC_GENERATE_KEYFILE,213,230,123,14
     DEFPUSHBUTTON   "OK",IDOK,279,8,59,14
     PUSHBUTTON      "Cancel",IDCANCEL,279,25,59,14
     LTEXT           "",IDT_KEYFILES_NOTE,10,161,324,41,0,WS_EX_TRANSPARENT
     LTEXT           "WARNING: If you lose a keyfile or if any bit of its first 1024 kilobytes changes, it will be impossible to mount volumes that use the keyfile!",IDT_KEYFILE_WARNING,279,44,58,85,0,WS_EX_TRANSPARENT
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,2,154,343,1,WS_EX_STATICEDGE
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,2,209,343,1,WS_EX_STATICEDGE
-    LTEXT           "More information on keyfiles",IDC_LINK_KEYFILES_INFO,96,220,108,10,SS_NOTIFY
+    LTEXT           "More information on keyfiles",IDC_LINK_KEYFILES_INFO,96,233,108,10,SS_NOTIFY
+    CONTROL         "Try first to mount with an empty password",IDC_KEYFILES_TRY_EMPTY_PASSWORD,
+                    "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,7,217,205,10
 END
 
 IDD_LANGUAGE DIALOGEX 0, 0, 209, 183
@@ -362,7 +364,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 330
         TOPMARGIN, 7
-        BOTTOMMARGIN, 230
+        BOTTOMMARGIN, 244
     END
 
     IDD_LANGUAGE, DIALOG

src/Common/Keyfiles.c

@@ -26,6 +26,9 @@
 #include "Common/resource.h"
 #include "Platform/Finally.h"
 #include "Platform/ForEach.h"
+#ifdef TCMOUNT
+#include "Mount/Mount.h"
+#endif
 
 #include <Strsafe.h>
 
@@ -466,6 +469,17 @@ BOOL CALLBACK KeyFilesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 			LoadKeyList (hwndDlg, param->FirstKeyFile);
 			SetCheckBox (hwndDlg, IDC_KEYFILES_ENABLE, param->EnableKeyFiles);
 			
+#ifdef TCMOUNT
+			if (	(origParam.EnableKeyFiles == defaultKeyFilesParam.EnableKeyFiles)
+				&&	(origParam.FirstKeyFile == defaultKeyFilesParam.FirstKeyFile)
+				)
+			{
+				/* default keyfile dialog case */
+				SetCheckBox (hwndDlg, IDC_KEYFILES_TRY_EMPTY_PASSWORD, bTryEmptyPasswordWhenKeyfileUsed);
+				ShowWindow(GetDlgItem(hwndDlg, IDC_KEYFILES_TRY_EMPTY_PASSWORD), SW_SHOW);
+			}
+#endif
+
 			SetWindowTextW(GetDlgItem(hwndDlg, IDT_KEYFILES_NOTE), GetString ("KEYFILES_NOTE"));
 
 			ToHyperlink (hwndDlg, IDC_LINK_KEYFILES_INFO);
@@ -586,6 +600,17 @@ BOOL CALLBACK KeyFilesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 		if (lw == IDOK)
 		{
 			param->EnableKeyFiles = IsButtonChecked (GetDlgItem (hwndDlg, IDC_KEYFILES_ENABLE));
+
+#ifdef TCMOUNT
+			if (IsWindowVisible (GetDlgItem (hwndDlg, IDC_KEYFILES_TRY_EMPTY_PASSWORD)))
+			{
+				bTryEmptyPasswordWhenKeyfileUsed = IsButtonChecked (GetDlgItem (hwndDlg, IDC_KEYFILES_TRY_EMPTY_PASSWORD));
+
+				WaitCursor ();
+				SaveSettings (hwndDlg);
+				NormalCursor ();
+			}
+#endif
 			EndDialog (hwndDlg, IDOK);
 			return 1;
 		}

src/Common/Language.c

@@ -299,7 +299,7 @@ BOOL LoadLanguageFile ()
 
 						// UTF8 => wide char
 						len = MultiByteToWideChar (CP_UTF8, 0, attr, -1, wattr, sizeof (wattr) / sizeof(wattr[0]));
-						if (len == 0 || len == ERROR_NO_UNICODE_TRANSLATION)
+						if (len == 0)
 						{
 							MessageBox (0, key, "VeraCrypt: Error while decoding UTF-8 string", MB_ICONERROR);
 							return FALSE;
@@ -408,7 +408,7 @@ BOOL CALLBACK LanguageDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 					XmlGetAttributeText (xml, "name", attr, sizeof (attr));
 					len = MultiByteToWideChar (CP_UTF8, 0, attr, -1, wattr, sizeof (wattr) / sizeof(wattr[0]));
 
-					if (len != 0 && len != ERROR_NO_UNICODE_TRANSLATION
+					if (len != 0
 						&& (!defaultLangFound || wcscmp (wattr, L"English") != 0))
 					{
 						int i = (int) SendDlgItemMessageW (hwndDlg, IDC_LANGLIST, LB_ADDSTRING, 0, (LPARAM)wattr);
@@ -448,7 +448,7 @@ BOOL CALLBACK LanguageDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 								else
 								{
 									nLen = MultiByteToWideChar (CP_UTF8, 0, ActiveLangPackVersion, -1, wversion, sizeof (wversion) / sizeof(wversion[0]));
-									if (nLen != 0 && nLen != ERROR_NO_UNICODE_TRANSLATION)
+									if (nLen != 0)
 										StringCbPrintfW (szVers, sizeof(szVers),GetString("LANG_PACK_VERSION"), wversion);
 								}
 								SetWindowTextW (GetDlgItem (hwndDlg, IDC_LANGPACK_VERSION), szVers);
@@ -456,7 +456,7 @@ BOOL CALLBACK LanguageDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
 								// Translator credits
 								XmlGetAttributeText (xml, "translators", credits, sizeof (credits));
 								nLen = MultiByteToWideChar (CP_UTF8, 0, credits, -1, wcredits, sizeof (wcredits) / sizeof(wcredits[0]));
-								if (nLen != 0 && nLen != ERROR_NO_UNICODE_TRANSLATION)
+								if (nLen != 0)
 								{
 									SetWindowTextW (GetDlgItem (hwndDlg, IDC_LANGPACK_CREDITS), wcredits);
 								}

src/Common/Language.xml

@@ -45,6 +45,7 @@
     <control lang="en" key="IDC_HIDVOL_WIZ_MODE_FULL">Normal mode</control>
     <control lang="en" key="IDC_KB">&amp;KB</control>
     <control lang="en" key="IDC_KEYFILES_ENABLE">U&amp;se keyfiles</control>
+    <control lang="en" key="IDC_KEYFILES_TRY_EMPTY_PASSWORD">Try first to mount with an empty password</control>
     <control lang="en" key="IDC_KEYFILES_RANDOM_SIZE">Random size ( 64 &lt;-&gt; 1048576 )</control>
     <control lang="en" key="IDC_KEY_FILES">&amp;Keyfiles...</control>
     <control lang="en" key="IDC_LINK_HASH_INFO">Information on hash algorithms</control>
@@ -119,6 +120,7 @@
     <control lang="en" key="IDC_CREATE">Create</control>
     <control lang="en" key="IDC_CREATE_VOLUME">&amp;Create Volume</control>
     <control lang="en" key="IDC_DISABLE_BOOT_LOADER_OUTPUT">Do not &amp;show any texts in the pre-boot authentication screen (except the below custom message)</control>
+    <control lang="en" key="IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION">Disable "Evil Maid" attack detection</control>
     <control lang="en" key="IDC_ENABLE_HARDWARE_ENCRYPTION">Accelerate AES encryption/decryption by using the AES instructions of the processor (if available)</control>
     <control lang="en" key="IDC_ENABLE_KEYFILES">Use keyfiles</control>
     <control lang="en" key="IDC_ENABLE_NEW_KEYFILES">Use keyfiles</control>

src/Common/Resource.h

@@ -194,6 +194,7 @@
 #define IDC_PIM_ENABLE                  5132
 #define IDC_VOLUME_LABEL                5133
 #define IDT_VOLUME_LABEL                5134
+#define IDC_KEYFILES_TRY_EMPTY_PASSWORD 5135
 
 // Next default values for new objects
 // 
@@ -202,7 +203,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        542
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         5135
+#define _APS_NEXT_CONTROL_VALUE         5136
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

src/Common/Tcdefs.h

@@ -17,15 +17,15 @@
 #define TC_APP_NAME						"VeraCrypt"
 
 // Version displayed to user 
-#define VERSION_STRING					"1.15"
+#define VERSION_STRING					"1.16"
 
 // Version number to compare against driver
-#define VERSION_NUM						0x0115
+#define VERSION_NUM						0x0116
 
 // Release date
-#define TC_STR_RELEASE_DATE			"Septembre 26th, 2015"
+#define TC_STR_RELEASE_DATE			"October 7th, 2015"
 #define TC_RELEASE_DATE_YEAR			2015
-#define TC_RELEASE_DATE_MONTH			09
+#define TC_RELEASE_DATE_MONTH			10
 
 #define BYTES_PER_KB                    1024LL
 #define BYTES_PER_MB                    1048576LL

src/Driver/Driver.rc

@@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,15,6,0
+ FILEVERSION 1,16,1,0
- PRODUCTVERSION 1,15,6,0
+ PRODUCTVERSION 1,16,1,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -45,11 +45,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt Driver"
-            VALUE "FileVersion", "1.15"
+            VALUE "FileVersion", "1.16"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "veracrypt.sys"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.15"
+            VALUE "ProductVersion", "1.16"
         END
     END
     BLOCK "VarFileInfo"

src/Driver/Ntdriver.c

@@ -416,8 +416,8 @@ NTSTATUS TCCreateDeviceObject (PDRIVER_OBJECT DriverObject,
 		       PDEVICE_OBJECT * ppDeviceObject,
 		       MOUNT_STRUCT * mount)
 {
-	UNICODE_STRING Win32NameString, ntUnicodeString;
+	UNICODE_STRING ntUnicodeString;
-	WCHAR dosname[32], ntname[32];
+	WCHAR ntname[32];
 	PEXTENSION Extension;
 	NTSTATUS ntStatus;
 	ULONG devChars = 0;
@@ -425,10 +425,8 @@ NTSTATUS TCCreateDeviceObject (PDRIVER_OBJECT DriverObject,
 	Dump ("TCCreateDeviceObject BEGIN\n");
 	ASSERT (KeGetCurrentIrql() == PASSIVE_LEVEL);
 
-	TCGetDosNameFromNumber (dosname, sizeof(dosname),mount->nDosDriveNo);
 	TCGetNTNameFromNumber (ntname, sizeof(ntname),mount->nDosDriveNo);
 	RtlInitUnicodeString (&ntUnicodeString, ntname);
-	RtlInitUnicodeString (&Win32NameString, dosname);
 
 	devChars = FILE_DEVICE_SECURE_OPEN;
 	devChars |= mount->bMountReadOnly ? FILE_READ_ONLY_DEVICE : 0;
@@ -588,7 +586,7 @@ NTSTATUS ProcessVolumeDeviceControlIrp (PDEVICE_OBJECT DeviceObject, PEXTENSION
 				break; 
 			}
 
-			TCGetDosNameFromNumber (ntName, sizeof(ntName),Extension->nDosDriveNo);
+			TCGetDosNameFromNumber (ntName, sizeof(ntName),Extension->nDosDriveNo, DeviceNamespaceDefault);
 			RtlInitUnicodeString (&ntUnicodeString, ntName);
 
 			outLength = FIELD_OFFSET(MOUNTDEV_SUGGESTED_LINK_NAME,Name) + ntUnicodeString.Length;
@@ -1967,14 +1965,23 @@ void TCGetNTNameFromNumber (LPWSTR ntname, int cbNtName, int nDriveNo)
 	RtlStringCbCatW (ntname, cbNtName, tmp);
 }
 
-void TCGetDosNameFromNumber (LPWSTR dosname,int cbDosName, int nDriveNo)
+void TCGetDosNameFromNumber (LPWSTR dosname,int cbDosName, int nDriveNo, DeviceNamespaceType namespaceType)
 {
 	WCHAR tmp[3] =
 	{0, ':', 0};
 	int j = nDriveNo + (WCHAR) 'A';
 
 	tmp[0] = (short) j;
-	RtlStringCbCopyW (dosname, cbDosName, (LPWSTR) DOS_MOUNT_PREFIX);
+
+	if (DeviceNamespaceGlobal == namespaceType)
+	{
+		RtlStringCbCopyW (dosname, cbDosName, (LPWSTR) DOS_MOUNT_PREFIX_GLOBAL);
+	}
+	else
+	{
+		RtlStringCbCopyW (dosname, cbDosName, (LPWSTR) DOS_MOUNT_PREFIX_DEFAULT);
+	}
+
 	RtlStringCbCatW (dosname, cbDosName, tmp);
 }
 
@@ -2540,7 +2547,7 @@ NTSTATUS CreateDriveLink (int nDosDriveNo)
 	NTSTATUS ntStatus;
 
 	TCGetNTNameFromNumber (dev, sizeof(dev),nDosDriveNo);
-	TCGetDosNameFromNumber (link, sizeof(link),nDosDriveNo);
+	TCGetDosNameFromNumber (link, sizeof(link),nDosDriveNo, DeviceNamespaceDefault);
 
 	RtlInitUnicodeString (&deviceName, dev);
 	RtlInitUnicodeString (&symLink, link);
@@ -2557,7 +2564,7 @@ NTSTATUS RemoveDriveLink (int nDosDriveNo)
 	UNICODE_STRING symLink;
 	NTSTATUS ntStatus;
 
-	TCGetDosNameFromNumber (link, sizeof(link),nDosDriveNo);
+	TCGetDosNameFromNumber (link, sizeof(link),nDosDriveNo, DeviceNamespaceDefault);
 	RtlInitUnicodeString (&symLink, link);
 
 	ntStatus = IoDeleteSymbolicLink (&symLink);
@@ -2582,7 +2589,7 @@ NTSTATUS MountManagerMount (MOUNT_STRUCT *mount)
 		in, (ULONG) (sizeof (in->DeviceNameLength) + wcslen (arrVolume) * 2), 0, 0);
 
 	memset (buf, 0, sizeof buf);
-	TCGetDosNameFromNumber ((PWSTR) &point[1], sizeof(buf) - sizeof(MOUNTMGR_CREATE_POINT_INPUT),mount->nDosDriveNo);
+	TCGetDosNameFromNumber ((PWSTR) &point[1], sizeof(buf) - sizeof(MOUNTMGR_CREATE_POINT_INPUT),mount->nDosDriveNo, DeviceNamespaceDefault);
 
 	point->SymbolicLinkNameOffset = sizeof (MOUNTMGR_CREATE_POINT_INPUT);
 	point->SymbolicLinkNameLength = (USHORT) wcslen ((PWSTR) &point[1]) * 2;
@@ -2592,7 +2599,7 @@ NTSTATUS MountManagerMount (MOUNT_STRUCT *mount)
 	point->DeviceNameLength = (USHORT) wcslen ((PWSTR) (buf + point->DeviceNameOffset)) * 2;
 
 	ntStatus = TCDeviceIoControl (MOUNTMGR_DEVICE_NAME, IOCTL_MOUNTMGR_CREATE_POINT, point,
-		point->DeviceNameOffset + point->DeviceNameLength, 0, 0);
+			point->DeviceNameOffset + point->DeviceNameLength, 0, 0);
 
 	return ntStatus;
 }
@@ -2606,7 +2613,7 @@ NTSTATUS MountManagerUnmount (int nDosDriveNo)
 
 	memset (buf, 0, sizeof buf);
 
-	TCGetDosNameFromNumber ((PWSTR) &in[1], sizeof(buf) - sizeof(MOUNTMGR_MOUNT_POINT),nDosDriveNo);
+	TCGetDosNameFromNumber ((PWSTR) &in[1], sizeof(buf) - sizeof(MOUNTMGR_MOUNT_POINT),nDosDriveNo, DeviceNamespaceDefault);
 
 	// Only symbolic link can be deleted with IOCTL_MOUNTMGR_DELETE_POINTS. If any other entry is specified, the mount manager will ignore subsequent IOCTL_MOUNTMGR_VOLUME_ARRIVAL_NOTIFICATION for the same volume ID.
 	in->SymbolicLinkNameOffset = sizeof (MOUNTMGR_MOUNT_POINT);
@@ -2627,7 +2634,10 @@ NTSTATUS MountDevice (PDEVICE_OBJECT DeviceObject, MOUNT_STRUCT *mount)
 	NTSTATUS ntStatus;	
 
 	// Make sure the user is asking for a reasonable nDosDriveNo
-	if (mount->nDosDriveNo >= 0 && mount->nDosDriveNo <= 25 && IsDriveLetterAvailable (mount->nDosDriveNo))
+	if (mount->nDosDriveNo >= 0 && mount->nDosDriveNo <= 25 
+		&& IsDriveLetterAvailable (mount->nDosDriveNo, DeviceNamespaceDefault) // drive letter must not exist both locally and globally
+		&& IsDriveLetterAvailable (mount->nDosDriveNo, DeviceNamespaceGlobal)
+		)
 	{
 		Dump ("Mount request looks valid\n");
 	}
@@ -2718,6 +2728,16 @@ NTSTATUS MountDevice (PDEVICE_OBJECT DeviceObject, MOUNT_STRUCT *mount)
 
 				NewExtension->UniqueVolumeId = LastUniqueVolumeId++;
 
+				// check again that the drive letter is available globally and locally
+				if (	!IsDriveLetterAvailable (mount->nDosDriveNo, DeviceNamespaceDefault)
+					|| !IsDriveLetterAvailable (mount->nDosDriveNo, DeviceNamespaceGlobal)
+					)
+				{
+						TCDeleteDeviceObject (NewDeviceObject, NewExtension);
+						mount->nReturnCode = ERR_DRIVE_NOT_FOUND;
+						return ERR_DRIVE_NOT_FOUND;
+				}
+
 				if (mount->bMountManager)
 					MountManagerMount (mount);
 
@@ -3051,8 +3071,7 @@ BOOL UserCanAccessDriveDevice ()
 	return IsAccessibleByUser (&name, FALSE);
 }
 
-
+BOOL IsDriveLetterAvailable (int nDosDriveNo, DeviceNamespaceType namespaceType)
-BOOL IsDriveLetterAvailable (int nDosDriveNo)
 {
 	OBJECT_ATTRIBUTES objectAttributes;
 	UNICODE_STRING objectName;
@@ -3060,7 +3079,7 @@ BOOL IsDriveLetterAvailable (int nDosDriveNo)
 	HANDLE handle;
 	NTSTATUS ntStatus;
 
-	TCGetDosNameFromNumber (link, sizeof(link),nDosDriveNo);
+	TCGetDosNameFromNumber (link, sizeof(link),nDosDriveNo, namespaceType);
 	RtlInitUnicodeString (&objectName, link);
 	InitializeObjectAttributes (&objectAttributes, &objectName, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL);
 

src/Driver/Ntdriver.h

@@ -101,6 +101,11 @@ typedef enum
 	ValidateInputOutput
 } ValidateIOBufferSizeType;
 
+typedef enum
+{
+	DeviceNamespaceDefault,
+	DeviceNamespaceGlobal,
+} DeviceNamespaceType;
 
 extern PDRIVER_OBJECT TCDriverObject;
 extern PDEVICE_OBJECT RootDeviceObject;
@@ -133,7 +138,7 @@ void TCStopVolumeThread (PDEVICE_OBJECT DeviceObject, PEXTENSION Extension);
 VOID VolumeThreadProc (PVOID Context);
 void TCSleep (int milliSeconds);
 void TCGetNTNameFromNumber (LPWSTR ntname, int cbNtName, int nDriveNo);
-void TCGetDosNameFromNumber (LPWSTR dosname, int cbDosName, int nDriveNo);
+void TCGetDosNameFromNumber (LPWSTR dosname, int cbDosName, int nDriveNo, DeviceNamespaceType namespaceType);
 LPWSTR TCTranslateCode (ULONG ulCode);
 void TCDeleteDeviceObject (PDEVICE_OBJECT DeviceObject, PEXTENSION Extension);
 VOID TCUnloadDriver (PDRIVER_OBJECT DriverObject);
@@ -161,7 +166,7 @@ BOOL UserCanAccessDriveDevice ();
 size_t GetCpuCount ();
 void EnsureNullTerminatedString (wchar_t *str, size_t maxSizeInBytes);
 void *AllocateMemoryWithTimeout (size_t size, int retryDelay, int timeout);
-BOOL IsDriveLetterAvailable (int nDosDriveNo);
+BOOL IsDriveLetterAvailable (int nDosDriveNo, DeviceNamespaceType namespaceType);
 NTSTATUS TCReadRegistryKey (PUNICODE_STRING keyPath, wchar_t *keyValueName, PKEY_VALUE_PARTIAL_INFORMATION *keyData);
 NTSTATUS TCWriteRegistryKey (PUNICODE_STRING keyPath, wchar_t *keyValueName, ULONG keyValueType, void *valueData, ULONG valueSize);
 BOOL IsVolumeClassFilterRegistered ();

src/ExpandVolume/ExpandVolume.rc

@@ -190,8 +190,8 @@ IDR_MOUNT_RSRC_HEADER   HEADER                  "resource.h"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,15,6,0
+ FILEVERSION 1,16,1,0
- PRODUCTVERSION 1,15,6,0
+ PRODUCTVERSION 1,16,1,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -208,11 +208,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt Expander"
-            VALUE "FileVersion", "1.15"
+            VALUE "FileVersion", "1.16"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "VeraCryptExpander.exe"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.15"
+            VALUE "ProductVersion", "1.16"
         END
     END
     BLOCK "VarFileInfo"

src/Format/Format.rc

@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,15,6,0
+ FILEVERSION 1,16,1,0
- PRODUCTVERSION 1,15,6,0
+ PRODUCTVERSION 1,16,1,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt Format"
-            VALUE "FileVersion", "1.15"
+            VALUE "FileVersion", "1.16"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "VeraCrypt Format.exe"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.15"
+            VALUE "ProductVersion", "1.16"
         END
     END
     BLOCK "VarFileInfo"

src/Mount/Mount.c

@@ -86,6 +86,9 @@ BOOL bCacheInDriver = FALSE;		/* Cache any passwords we see */
 BOOL bCacheInDriverDefault = FALSE;
 BOOL bCacheDuringMultipleMount = FALSE;
 BOOL bCmdCacheDuringMultipleMount = FALSE;
+BOOL bTryEmptyPasswordWhenKeyfileUsed = FALSE;
+BOOL bCmdTryEmptyPasswordWhenKeyfileUsed = FALSE;
+BOOL bCmdTryEmptyPasswordWhenKeyfileUsedValid = FALSE;
 BOOL bHistoryCmdLine = FALSE;		/* History control is always disabled */
 BOOL bUseDifferentTrayIconIfVolMounted = TRUE;
 BOOL bCloseDismountedWindows=TRUE;	/* Close all open explorer windows of dismounted volume */
@@ -680,6 +683,8 @@ void LoadSettingsAndCheckModified (HWND hwndDlg, BOOL bOnlyCheckModified, BOOL*
 	ConfigReadCompareInt ("WipePasswordCacheOnExit", FALSE, &bWipeCacheOnExit, bOnlyCheckModified, pbSettingsModified);
 	ConfigReadCompareInt ("WipeCacheOnAutoDismount", TRUE, &bWipeCacheOnAutoDismount, bOnlyCheckModified, pbSettingsModified);
 
+	ConfigReadCompareInt ("TryEmptyPasswordWhenKeyfileUsed",FALSE, &bTryEmptyPasswordWhenKeyfileUsed, bOnlyCheckModified, pbSettingsModified);
+
 	ConfigReadCompareInt ("StartOnLogon", FALSE, &bStartOnLogon, bOnlyCheckModified, pbSettingsModified);
 	ConfigReadCompareInt ("MountDevicesOnLogon", FALSE, &bMountDevicesOnLogon, bOnlyCheckModified, pbSettingsModified);
 	ConfigReadCompareInt ("MountFavoritesOnLogon", FALSE, &bMountFavoritesOnLogon, bOnlyCheckModified, pbSettingsModified);
@@ -835,6 +840,8 @@ void SaveSettings (HWND hwndDlg)
 		ConfigWriteInt ("WipePasswordCacheOnExit",			bWipeCacheOnExit);
 		ConfigWriteInt ("WipeCacheOnAutoDismount",			bWipeCacheOnAutoDismount);
 
+		ConfigWriteInt ("TryEmptyPasswordWhenKeyfileUsed",	bTryEmptyPasswordWhenKeyfileUsed);
+
 		ConfigWriteInt ("StartOnLogon",						bStartOnLogon);
 		ConfigWriteInt ("MountDevicesOnLogon",				bMountDevicesOnLogon);
 		ConfigWriteInt ("MountFavoritesOnLogon",			bMountFavoritesOnLogon);
@@ -4353,6 +4360,8 @@ static BOOL Mount (HWND hwndDlg, int nDosDriveNo, char *szFileName, int pim)
 	BOOL EffectiveVolumeTrueCryptMode = CmdVolumeTrueCryptMode;
 	int EffectiveVolumePim = (pim < 0)? CmdVolumePim : pim;
 	BOOL bEffectiveCacheDuringMultipleMount = bCmdCacheDuringMultipleMount? TRUE: bCacheDuringMultipleMount;
+	BOOL bEffectiveTryEmptyPasswordWhenKeyfileUsed = bCmdTryEmptyPasswordWhenKeyfileUsedValid? bCmdTryEmptyPasswordWhenKeyfileUsed : bTryEmptyPasswordWhenKeyfileUsed;
+	BOOL bUseCmdVolumePassword = CmdVolumePasswordValid && ((CmdVolumePassword.Length > 0) || (KeyFilesEnable && FirstKeyFile));
 
 	/* Priority is given to command line parameters 
 	 * Default values used only when nothing specified in command line
@@ -4405,29 +4414,32 @@ static BOOL Mount (HWND hwndDlg, int nDosDriveNo, char *szFileName, int pim)
 
 	ResetWrongPwdRetryCount ();
 
-	// First try cached passwords and if they fail ask user for a new one
 	WaitCursor ();
 
-	// try TrueCrypt mode first since it is quick, only if pim = 0
+	if (!bUseCmdVolumePassword)
-	if (EffectiveVolumePim == 0)
-		mounted = MountVolume (hwndDlg, nDosDriveNo, szFileName, NULL, 0, 0, TRUE, bCacheInDriver, bForceMount, &mountOptions, Silent, FALSE);
-	if (!mounted)
-		mounted = MountVolume (hwndDlg, nDosDriveNo, szFileName, NULL, 0, EffectiveVolumePim, FALSE, bCacheInDriver, bForceMount, &mountOptions, Silent, FALSE);
-	
-	// If keyfiles are enabled, test empty password first
-	if (!mounted && KeyFilesEnable && FirstKeyFile)
 	{
-		Password emptyPassword;
+		// First try cached passwords and if they fail ask user for a new one
-		emptyPassword.Length = 0;
-
-		KeyFilesApply (hwndDlg, &emptyPassword, FirstKeyFile, szFileName);
 		// try TrueCrypt mode first since it is quick, only if pim = 0
 		if (EffectiveVolumePim == 0)
-			mounted = MountVolume (hwndDlg, nDosDriveNo, szFileName, &emptyPassword, 0, 0, TRUE, bCacheInDriver, bForceMount, &mountOptions, Silent, FALSE);
+			mounted = MountVolume (hwndDlg, nDosDriveNo, szFileName, NULL, 0, 0, TRUE, bCacheInDriver, bForceMount, &mountOptions, Silent, FALSE);
 		if (!mounted)
-			mounted = MountVolume (hwndDlg, nDosDriveNo, szFileName, &emptyPassword, 0, EffectiveVolumePim, FALSE, bCacheInDriver, bForceMount, &mountOptions, Silent, FALSE);
+			mounted = MountVolume (hwndDlg, nDosDriveNo, szFileName, NULL, 0, EffectiveVolumePim, FALSE, bCacheInDriver, bForceMount, &mountOptions, Silent, FALSE);
 		
-		burn (&emptyPassword, sizeof (emptyPassword));
+		// If keyfiles are enabled, test empty password first
+		if (!mounted && KeyFilesEnable && FirstKeyFile && bEffectiveTryEmptyPasswordWhenKeyfileUsed)
+		{
+			Password emptyPassword;
+			emptyPassword.Length = 0;
+
+			KeyFilesApply (hwndDlg, &emptyPassword, FirstKeyFile, szFileName);
+			// try TrueCrypt mode first since it is quick, only if pim = 0
+			if (EffectiveVolumePim == 0)
+				mounted = MountVolume (hwndDlg, nDosDriveNo, szFileName, &emptyPassword, 0, 0, TRUE, bCacheInDriver, bForceMount, &mountOptions, Silent, FALSE);
+			if (!mounted)
+				mounted = MountVolume (hwndDlg, nDosDriveNo, szFileName, &emptyPassword, 0, EffectiveVolumePim, FALSE, bCacheInDriver, bForceMount, &mountOptions, Silent, FALSE);
+			
+			burn (&emptyPassword, sizeof (emptyPassword));
+		}
 	}
 
 	// Test password and/or keyfiles used for the previous volume
@@ -4452,7 +4464,7 @@ static BOOL Mount (HWND hwndDlg, int nDosDriveNo, char *szFileName, int pim)
 
 	while (mounted == 0)
 	{		
-		if (CmdVolumePassword.Length > 0)
+		if (bUseCmdVolumePassword)
 		{
 			VolumePassword = CmdVolumePassword;
 			VolumePkcs5 = EffectiveVolumePkcs5;
@@ -6194,18 +6206,22 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 			{
 				if (IsHiddenOSRunning())
 				{
+					uint32 driverConfig = ReadDriverConfigurationFlags();
 					if (BootEncObj->GetInstalledBootLoaderVersion() != VERSION_NUM)
 						Warning ("UPDATE_TC_IN_HIDDEN_OS_TOO", hwndDlg);
-					if (!BootEncObj->CheckBootloaderFingerprint ())
+					if (	!(driverConfig & TC_DRIVER_CONFIG_DISABLE_EVIL_MAID_ATTACK_DETECTION)
+						&&	!BootEncObj->CheckBootloaderFingerprint ())
 						Warning ("BOOT_LOADER_FINGERPRINT_CHECK_FAILED", hwndDlg);
 				}
 				else if (SysDriveOrPartitionFullyEncrypted (TRUE))
 				{
+					uint32 driverConfig = ReadDriverConfigurationFlags();
 					if (BootEncObj->GetInstalledBootLoaderVersion() != VERSION_NUM)
 					{
 						Warning ("BOOT_LOADER_VERSION_DIFFERENT_FROM_DRIVER_VERSION", hwndDlg);
 					}
-					if (!BootEncObj->CheckBootloaderFingerprint ())
+					if (	!(driverConfig & TC_DRIVER_CONFIG_DISABLE_EVIL_MAID_ATTACK_DETECTION)
+						&&	!BootEncObj->CheckBootloaderFingerprint ())
 						Warning ("BOOT_LOADER_FINGERPRINT_CHECK_FAILED", hwndDlg);
 				}
 			} 
@@ -6251,6 +6267,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 					BOOL mounted = FALSE;
 					int EffectiveVolumePkcs5 = CmdVolumePkcs5;
 					BOOL EffectiveVolumeTrueCryptMode = CmdVolumeTrueCryptMode;
+					BOOL bEffectiveTryEmptyPasswordWhenKeyfileUsed = bCmdTryEmptyPasswordWhenKeyfileUsedValid? bCmdTryEmptyPasswordWhenKeyfileUsed : bTryEmptyPasswordWhenKeyfileUsed;
 
 					if (!VolumePathExists (szFileName))
 					{
@@ -6270,7 +6287,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 						mounted = MountVolume (hwndDlg, szDriveLetter[0] - 'A', szFileName, NULL, EffectiveVolumePkcs5, CmdVolumePim, EffectiveVolumeTrueCryptMode, bCacheInDriver, bForceMount, &mountOptions, Silent, FALSE);
 
 						// Command line password or keyfiles
-						if (!mounted && (CmdVolumePassword.Length != 0 || FirstCmdKeyFile))
+						if (!mounted && (CmdVolumePassword.Length != 0 || (FirstCmdKeyFile && (CmdVolumePasswordValid || bEffectiveTryEmptyPasswordWhenKeyfileUsed))))
 						{
 							BOOL reportBadPasswd = CmdVolumePassword.Length > 0;
 
@@ -8086,6 +8103,7 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
 				OptionPkcs5,
 				OptionTrueCryptMode,
 				OptionPim,
+				OptionTryEmptyPassword,
 			};
 
 			argument args[]=
@@ -8110,6 +8128,7 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
 				{ OptionTrueCryptMode,			"/truecrypt",			"/tc", FALSE },
 				{ OptionVolume,					"/volume",			"/v", FALSE },
 				{ CommandWipeCache,				"/wipecache",		"/w", FALSE },
+				{ OptionTryEmptyPassword,		"/tryemptypass",	NULL, FALSE },
 			};
 
 			argumentspec as;
@@ -8143,6 +8162,25 @@ void ExtractCommandLine (HWND hwndDlg, char *lpszCommandLine)
 				bBeep = TRUE;
 				break;
 
+			case OptionTryEmptyPassword:
+				{
+					char szTmp[16] = {0};
+					bCmdTryEmptyPasswordWhenKeyfileUsed = TRUE;
+					bCmdTryEmptyPasswordWhenKeyfileUsedValid = TRUE;
+
+					if (HAS_ARGUMENT == GetArgumentValue (lpszCommandLineArgs, &i, nNoCommandLineArgs,
+						     szTmp, sizeof (szTmp)))
+					{
+						if (!_stricmp(szTmp,"n") || !_stricmp(szTmp,"no"))
+							bCmdTryEmptyPasswordWhenKeyfileUsed = FALSE;
+						else if (!_stricmp(szTmp,"y") || !_stricmp(szTmp,"yes"))
+							bCmdTryEmptyPasswordWhenKeyfileUsed = TRUE;
+						else
+							AbortProcess ("COMMAND_LINE_ERROR");
+					}
+				}
+				break;
+
 			case OptionCache:
 				{
 					char szTmp[16] = {0};
@@ -9807,7 +9845,7 @@ int RestoreVolumeHeader (HWND hwndDlg, const char *lpszVolume)
 		{
 			int GuiPkcs5 = ((EffectiveVolumePkcs5 > 0) && (VolumePkcs5 == 0))? EffectiveVolumePkcs5 : VolumePkcs5;
 			int GuiPim = ((EffectiveVolumePim > 0) && (VolumePim <= 0))? EffectiveVolumePim : VolumePim;
-			if (!AskVolumePassword (hwndDlg, &VolumePassword, &VolumePkcs5, &VolumePim, &VolumeTrueCryptMode, "ENTER_HEADER_BACKUP_PASSWORD", FALSE))
+			if (!AskVolumePassword (hwndDlg, &VolumePassword, &GuiPkcs5, &GuiPim, &VolumeTrueCryptMode, "ENTER_HEADER_BACKUP_PASSWORD", FALSE))
 			{
 				nStatus = ERR_SUCCESS;
 				goto ret;
@@ -10390,6 +10428,7 @@ static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARA
 				CheckDlgButton (hwndDlg, IDC_DISABLE_BOOT_LOADER_OUTPUT, (userConfig & TC_BOOT_USER_CFG_FLAG_SILENT_MODE) ? BST_CHECKED : BST_UNCHECKED);
 				CheckDlgButton (hwndDlg, IDC_ALLOW_ESC_PBA_BYPASS, (userConfig & TC_BOOT_USER_CFG_FLAG_DISABLE_ESC) ? BST_UNCHECKED : BST_CHECKED);
 				CheckDlgButton (hwndDlg, IDC_BOOT_LOADER_CACHE_PASSWORD, (driverConfig & TC_DRIVER_CONFIG_CACHE_BOOT_PASSWORD) ? BST_CHECKED : BST_UNCHECKED);
+				CheckDlgButton (hwndDlg, IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION, (driverConfig & TC_DRIVER_CONFIG_DISABLE_EVIL_MAID_ATTACK_DETECTION) ? BST_CHECKED : BST_UNCHECKED);
 
 				SetWindowTextW (GetDlgItem (hwndDlg, IDC_CUSTOM_BOOT_LOADER_MESSAGE_HELP), GetString("CUSTOM_BOOT_LOADER_MESSAGE_HELP"));
 			}
@@ -10446,6 +10485,7 @@ static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARA
 				{
 					BootEncObj->WriteBootSectorUserConfig (userConfig, customUserMessage);
 					SetDriverConfigurationFlag (TC_DRIVER_CONFIG_CACHE_BOOT_PASSWORD, IsDlgButtonChecked (hwndDlg, IDC_BOOT_LOADER_CACHE_PASSWORD));
+					SetDriverConfigurationFlag (TC_DRIVER_CONFIG_DISABLE_EVIL_MAID_ATTACK_DETECTION, IsDlgButtonChecked (hwndDlg, IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION));
 				}
 				catch (Exception &e)
 				{

src/Mount/Mount.h

@@ -65,6 +65,7 @@ extern BOOL bCloseBkgTaskWhenNoVolumes;
 extern BOOL bPlaySoundOnSuccessfulHkDismount;
 extern BOOL bDisplayBalloonOnSuccessfulHkDismount;
 extern BOOL bExplore;
+extern BOOL bTryEmptyPasswordWhenKeyfileUsed;
 
 static void localcleanup ( void );
 void EndMainDlg ( HWND hwndDlg );

src/Mount/Mount.rc

@@ -275,7 +275,7 @@ BEGIN
     LTEXT           "",IDT_PKCS11_LIB_HELP,16,63,286,65
 END
 
-IDD_SYSENC_SETTINGS DIALOGEX 0, 0, 370, 242
+IDD_SYSENC_SETTINGS DIALOGEX 0, 0, 370, 261
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "VeraCrypt - System Encryption Settings"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
@@ -287,12 +287,14 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,178,339,10
     CONTROL         "Allow pre-boot &authentication to be bypassed by pressing the Esc key (enables boot manager)",IDC_ALLOW_ESC_PBA_BYPASS,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,193,340,10
-    DEFPUSHBUTTON   "OK",IDOK,257,220,50,14
+    DEFPUSHBUTTON   "OK",IDOK,257,233,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,313,220,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,313,233,50,14
     LTEXT           "Display this custom message in the pre-boot authentication screen (24 characters maximum):",IDT_CUSTOM_BOOT_LOADER_MESSAGE,18,41,337,8
     GROUPBOX        "Boot Loader Screen Options",IDT_BOOT_LOADER_SCREEN_OPTIONS,8,7,355,150
-    GROUPBOX        "Security Options",IDT_SECURITY_OPTIONS,8,163,355,49
+    GROUPBOX        "Security Options",IDT_SECURITY_OPTIONS,8,163,355,62
     LTEXT           "",IDC_CUSTOM_BOOT_LOADER_MESSAGE_HELP,18,74,337,73
+    CONTROL         "Disable ""Evil Maid"" attack detection",IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,208,340,10
 END
 
 IDD_PERFORMANCE_SETTINGS DIALOGEX 0, 0, 370, 248
@@ -442,6 +444,7 @@ BEGIN
         LEFTMARGIN, 7
         RIGHTMARGIN, 363
         TOPMARGIN, 7
+        BOTTOMMARGIN, 247
     END
 
     IDD_PERFORMANCE_SETTINGS, DIALOG
@@ -477,8 +480,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,15,6,0
+ FILEVERSION 1,16,1,0
- PRODUCTVERSION 1,15,6,0
+ PRODUCTVERSION 1,16,1,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -495,11 +498,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt"
-            VALUE "FileVersion", "1.15"
+            VALUE "FileVersion", "1.16"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "VeraCrypt.exe"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.15"
+            VALUE "ProductVersion", "1.16"
         END
     END
     BLOCK "VarFileInfo"
@@ -588,7 +591,7 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Create Rescue Disk...",       IDM_CREATE_RESCUE_DISK
         MENUITEM "Verify Rescue Disk",          IDM_VERIFY_RESCUE_DISK
-        MENUITEM "Verify Rescue Disk ISO Image",IDM_VERIFY_RESCUE_DISK_ISO
+        MENUITEM "Verify Rescue Disk ISO Image", IDM_VERIFY_RESCUE_DISK_ISO
         MENUITEM SEPARATOR
         MENUITEM "Mount Without Pre-Boot &Authentication...", IDM_MOUNT_SYSENC_PART_WITHOUT_PBA
         MENUITEM SEPARATOR

src/Mount/Resource.h

@@ -172,6 +172,7 @@
 #define IDC_COPY_EXPANDER               1148
 #define IDT_DRIVER_OPTIONS              1149
 #define IDC_ENABLE_EXTENDED_IOCTL_SUPPORT 1150
+#define IDC_DISABLE_EVIL_MAID_ATTACK_DETECTION 1151
 #define IDM_HELP                        40001
 #define IDM_ABOUT                       40002
 #define IDM_UNMOUNT_VOLUME              40003
@@ -248,7 +249,7 @@
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        119
 #define _APS_NEXT_COMMAND_VALUE         40069
-#define _APS_NEXT_CONTROL_VALUE         1151
+#define _APS_NEXT_CONTROL_VALUE         1152
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif

src/Setup/MacOSX/veracrypt.pkgproj

@@ -495,7 +495,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.15.6</string>
+				<string>1.16.1</string>
 			</dict>
 			<key>UUID</key>
 			<string>B14381D9-EC5F-43E4-B971-82AB3D132A64</string>
@@ -1051,7 +1051,7 @@ Merci de ré-installer OSXFUSE et de cocher l'option de compatibilité MacFUSE d
 				</dict>
 			</array>
 			<key>NAME</key>
-			<string>VeraCrypt 1.15</string>
+			<string>VeraCrypt 1.16</string>
 		</dict>
 	</dict>
 	<key>SHARED_GLOBAL_DATA</key>

src/Setup/Setup.rc

@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,15,6,0
+ FILEVERSION 1,16,1,0
- PRODUCTVERSION 1,15,6,0
+ PRODUCTVERSION 1,16,1,0
  FILEFLAGSMASK 0x17L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "IDRIX"
             VALUE "FileDescription", "VeraCrypt Setup"
-            VALUE "FileVersion", "1.15"
+            VALUE "FileVersion", "1.16"
             VALUE "LegalTrademarks", "VeraCrypt"
             VALUE "OriginalFilename", "VeraCrypt Setup.exe"
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.15"
+            VALUE "ProductVersion", "1.16"
         END
     END
     BLOCK "VarFileInfo"

src/Signing/sign.bat

@@ -21,6 +21,6 @@ del *.xml
 
 cd "..\..\Signing"
 
-signtool sign /v /a /n IDRIX /ac Thawt_CodeSigning_CA.crt /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.15.exe"
+signtool sign /v /a /n IDRIX /ac Thawt_CodeSigning_CA.crt /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.16.exe"
 
 pause

src/Signing/sign_test.bat

@@ -24,6 +24,6 @@ del *.xml
 
 cd "..\..\Signing"
 
-signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac TestCertificate\idrix_TestRootCA.crt /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.15.exe"
+signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac TestCertificate\idrix_TestRootCA.crt /t http://timestamp.verisign.com/scripts/timestamp.dll "..\Release\Setup Files\VeraCrypt Setup 1.16.exe"
 
 pause