Linux/macOS: Implement missing Argon2 KDF support on Unix

Translations/Language.ar.xml

@@ -644,10 +644,13 @@
     <entry lang="ar" key="PIM_HIDVOL_TITLE">ة الخاص بالقرص المخفي PIM</entry>
     <entry lang="ar" key="PIM_HIDDEN_OS_TITLE">الخاص بالنظام المخفي PIM </entry>
     <entry lang="ar" key="PIM_HELP">PIM (مضاعف الدورات الشخصي) هو الرقم الذي يتحكم في عدد مرات التكرار المستخدم من مشتق مفتاح الترويسة كما يلي:\n     الدورات Iterations = 15000 + (PIM x 1000).\n\nحينما تكون القيمة صفر أو فراغ, فيرا كربت سيستخدم القيمة(485) والتي تضمن أمانا عاليا.\n\nحينما يكون طول كلمة السر أقل من عشرين,أقل من 485 للمحافظة على مستوى الأمان PIM لا يمكن أن تكون قيمة.\nحينما تكون كلمة السر طولها أكثر من عشرين,أي شيء PIM فيمكن أن تكون قيمة.\n\nإذا كانت قيمة PIM أعلى من 485 فهذا يعني تحميلا أبطأ. إذا كانت قيمة PIM أقل من 485 فهذا يعني تحميلا أسرع ولكن أمان أقل إذا كانت كلمة السر غير قوية.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="ar" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) مضاعف الدورات الشخصي) هو الرقم الذي يتحكم في عدد مرات التكرار المستخدم من مشتق مفتاح الترويسة كما يلي:\n    الدورات  Iterations = PIM x 2048.\n\nحينما تكون القيمة صفر أو فراغ, فيرا كربت سيستخدم القيمة(485) والتي تضمن أمانا عاليا.\n\nحينما يكون طول كلمة السر أقل من عشرين, PIM لا يمكن أن تكون قيمة أقل من 98 للمحافظة على مستوى الأمان.\nحينما تكون كلمة السر طولها أكثر من عشرين,أي شيء PIM فيمكن أن تكون قيمة.\n\n PIM إذا كانت قيمة أعلى من 98 فهذا يعني إقلاعا أبطأ. إذا كانت القيمة أقل من 98 فهذا يعني إقلاعا أسرع لكن أمان أقل إذا كانت كلمة السر غير قوية.</entry>
     <entry lang="ar" key="PIM_SYSENC_CHANGE_WARNING">تذكر الرقم لإقلاع النظام</entry>
     <entry lang="ar" key="PIM_LARGE_WARNING">قمت باختيار قيمة PIM أعلى من القيمة الافتراضية له في فيراكربت.\nالرجاء ملاحظة أن هذا يؤدي لإبطاء عملية الإقلاع أو التحميل.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="ar" key="PIM_SMALL_WARNING">قمت باختيار قيمة متدنية ل (PIM) وهي أدنى من القيمة الافتراضية له في فيراكربت. يرجى ملاحظة أنه إن لم تكن كلمة السر قوية فهذا يعني أمان أقل.\n\nهل تؤكد أنك تستخدم كلمة سر قوية?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="ar" key="PIM_SYSENC_TOO_BIG">أكبر قيمة ل (PIM) لتشفير النظام هي 65535.</entry>
     <entry lang="ar" key="PIM_TITLE">قيمة PIM للقرص</entry>
     <entry lang="ar" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nتحذير: وجدت ملفات مخفية في مسار ملف المفتاح. تلك الملفات المخفية لا تصلح كملف مفتاح. إذا كنت تريد استخدامهم كملف مفتاح, يرجى إزالة خاصية الإخفاء عنها (لضغط بالزر الأيمن عليها, اختر خصائص, أزل العلامة من أمام خاصية الإخفاء ثم اضغط زر نعم). ملاحظة: المفات المخفية تظهر إذا كانت خاصية الإخفاء بالكمبيوتر غير مفعلة (الكمبيوتر > ترتيب > 'خيارات المجلدات والبحث' > مشاهدة).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="ar" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">هذه الخوارزمية ليست مدعومة لنمط تروكربت.</entry>
     <entry lang="ar" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (مضاعف التكرار الشخصي) غير مدعوم لنمط تروكربت.</entry>
     <entry lang="ar" key="PIM_REQUIRE_LONG_PASSWORD">كلمة السر لابد أن تزيد عن عشرين كي يمكن استخدام مضاعف التكرار الشخصي PIM.\nكلمات السر الأقصر يمكن استخدامها إذا كان مضاعف التكرار الشخصي PIM 485 أو أكثر.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="ar" key="BOOT_PIM_REQUIRE_LONG_PASSWORD"> كلمة السر قبل الإقلاع لابد  أن تكون 20 أو أكثر من أجل استخدام مضاعف التكرار الشخصي المحدد\nكلمات السر الأقصر يمكن استخدامها إذا كان مضاعف التكرار الشخصي 98 أو أكثر.</entry>
     <entry lang="ar" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">‮لا يمكن حاليا استخدام الملفات المفاتيح عند تعمية النظام.</entry>
     <entry lang="ar" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">تنبيه: تعذَّر على ڤيراكربت استعادة النسق الأصلي للوحة المفاتيح مما قد يؤدي إلى أن تُدخلَ كلمة السر على نحو غير صحيح.</entry>

Translations/Language.be.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer > Organize > 'Folder and search options' > View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</entry>
     <entry lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</entry>

Translations/Language.bg.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer &gt; Organize &gt; 'Folder and search options' &gt; View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="bg" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">За сега ключ-файлове не се поддържат за системно криптиране.</entry>
     <entry lang="bg" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Внимание: VeraCrypt не може да възстанови оригиналната подредба на клавиатурата. Заради това може да въведете някоя парола грешно.</entry>

Translations/Language.ca.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer &gt; Organize &gt; 'Folder and search options' &gt; View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="ca" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Els fitxers de claus no estan suportats per al xifrat del sistema.</entry>
     <entry lang="ca" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">ATENCIÓ: El VeraCrypt no ha pogut restaurar la disposició de teclat orignal. Això pot provocar que introdueixi la contrasenya incorrectament.</entry>

Translations/Language.co.xml

@@ -664,10 +664,13 @@ Information about Corsican localization:
 	    <entry lang="co" key="PIM_HIDVOL_TITLE">PIM di u vulume piattatu</entry>
 	    <entry lang="co" key="PIM_HIDDEN_OS_TITLE">PIM per u sistema operatoriu piattatu</entry>
 	    <entry lang="co" key="PIM_HELP">PIM (Multiplicatore d’Iterazioni Persunali) hè u valore chì cuntrolleghja u contu d’iterazioni impiegate da a derivazione di a chjave d’intestatura cusì :\n      Iterazioni = 15000 + (PIM x 1000).\n\nQuandu u campu hè viotu o definitu à 0, VeraCrypt impiegheghja un valore predefinitu (485) chì assicureghja un altu livellu di sicurità.\n\nQuandu a parolla d’intesa hè menu longa chè 20 caratteri, u valore PIM ùn pò micca esse più chjucu chè 485 per mantene un livellu minimu di sicurità.\nQuandu a parolla d’intesa hè omancu di 20 caratteri, u PIM pò esse definitu à un qualunque valore.\n\nUn valore PIM più maiò chè 485 aumenterà a durata di muntatura. Un chjucu valore PIM (menu chè 485) riducerà a durata di muntatura ma què pò riduce a sicurità s’è a parolla d’intesa ùn hè abbastanza forta.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
 	    <entry lang="co" key="PIM_SYSENC_HELP">PIM (Multiplicatore d’Iterazioni Persunali) hè u valore chì cuntrolleghja u contu d’iterazioni impiegate da a derivazione di a chjave d’intestatura cusì :\n      Iterazioni = PIM x 2048.\n\nQuandu u campu hè viotu o definitu à 0, VeraCrypt impiegheghja un valore predefinitu chì assicureghja un altu livellu di sicurità.\n\nQuandu a parolla d’intesa hè menu longa chè 20 caratteri, u valore PIM ùn pò micca esse più chjucu chè 98 per mantene un livellu minimu di sicurità.\nQuandu a parolla d’intesa hè omancu di 20 caratteri, u PIM pò esse definitu à un qualunque valore.\n\nUn valore PIM più maiò chè 98 aumenterà a durata di a piccera. Un chjucu valore PIM (menu chè 98) riducerà a durata di a piccera ma què pò riduce a sicurità s’è a parolla d’intesa ùn hè abbastanza forta.</entry>
 	    <entry lang="co" key="PIM_SYSENC_CHANGE_WARNING">Arricurdassi di u numeru per piccià u sistema</entry>
 	    <entry lang="co" key="PIM_LARGE_WARNING">Avete sceltu un valore PIM più maiò chè u valore predefinitu di VeraCrypt.\nSappiate chì què pò aumentà a durata di a muntatura o di a piccera.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
 	    <entry lang="co" key="PIM_SMALL_WARNING">Avete sceltu un valore PIM (Multiplicatore d’Iterazioni Persunali) chì hè più chjucu chè u valore predefinitu di VeraCrypt. Sappiate chì, s’è a vostra parolla d’intesa ùn hè abbastanza forta, què pò riduce u livellu di sicurità.\n\nCunfirmate chì vò impiegate una parolla d’intesa forta ?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
 	    <entry lang="co" key="PIM_SYSENC_TOO_BIG">U valore massimu di u multiplicatore d’iterazioni persunali (PIM) per a cifratura di u sistema hè 65535.</entry>
 	    <entry lang="co" key="PIM_TITLE">PIM di u vulume</entry>
 	    <entry lang="co" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nAVERTIMENTU : Qualchì schedariu piattatu hè statu trovu in u chjassu di ricerca di u schedariu chjave. Un tale schedariu piattatu ùn pò micca esse impiegatu cum’è schedarii chjave. S’ella hè bisognu à impiegallu cum’è schedarii chjave, cacciate u so attributu « Piattatu » (cliccu dirittu nant’à u schedariu eppò selezziunate « Pruprietà », cacciate l¹ozzione « Piattatu », è cliccu nant’à « Vai »). Nota : I schedarii piattati sò videvule solu s’è l’ozzione currispondente hè attiva (Urdinatore &gt; Organizà &gt; Cartulare è ozzioni di ricerca &gt; Vista).</entry>
@@ -1124,6 +1127,7 @@ Information about Corsican localization:
 	    <entry lang="co" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Sta cudificazione ùn hè micca accettata per u modu TrueCrypt.</entry>
 	    <entry lang="co" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">U PIM (valore massimu di u multiplicatore d’iterazioni persunali) ùn hè micca accettatu per u modu TrueCrypt.</entry>
 	    <entry lang="co" key="PIM_REQUIRE_LONG_PASSWORD">A parolla d’intesa deve cuntene omancu 20 caratteri per pudè impiegà u valore PIM specificatu.\nE parolle d’intesa più corte ponu solu esse impiegate s’è u PIM hè uguale à 485 o superiore.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
 	    <entry lang="co" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">A parolla d’intesa d’autenticazione di prepiccera deve cuntene omancu 20 caratteri per pudè impiegà u valore PIM specificatu.\nE parolle d’intesa più corte ponu solu esse impiegate s’è u PIM hè uguale à 98 o superiore.</entry>
 	    <entry lang="co" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">I schedarii chjave ùn sò micca accettati attualmente per a cifratura di u sistema.</entry>
 	    <entry lang="co" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Avertimentu : VeraCrypt ùn hà micca pussutu risturà a dispusizione d’origine di a tastera. Què vi pò impedisce di stampittà currettamente a parolla d’intesa.</entry>

Translations/Language.cs.xml

@@ -644,10 +644,13 @@
     <entry lang="cs" key="PIM_HIDVOL_TITLE">Skrytý svazek PIM</entry>
     <entry lang="cs" key="PIM_HIDDEN_OS_TITLE">PIM pro skrytý operační systém</entry>
     <entry lang="cs" key="PIM_HELP">PIM je hodnota, která reguluje počet iterací použitých v odvozenině hlavičky klíče, jako např.:\n      Iterace = 15000 + (PIM x 1000).\n\nZanecháte-li prázdné, nebo nastavíte 0, VeraCrypt použije výchozí hodnotu (485), která zaručuje vysokou bezpečnost.\n\nJe-li heslo kratší než 20 znaků, PIM nesmí být menší než 485, aby byla zachována alespoň minimální úroveň zabezpečení.\nMá-li heslo minimálně 20 znaků, PIM může obsahovat jakoukoliv hodnotu.\n\nHodnota PIM větší než 485 bude mít za následek pomalejší připojení. Malá hodnota PIM (menší než 485) povede k rychlejšímu připojení, ale bude omezeno zabezpečení, není-li heslo dostatečně silné.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="cs" key="PIM_SYSENC_HELP">PIM je hodnota, která reguluje počet iterací použitých odvozením hlavičky klíče, jako např.:\n      Iterace = PIM x 2048.\n\nZanecháte-li prázdné, nebo nastavíte 0, VeraCrypt použije výchozí hodnotu, která zajistí vysoké zabezpečení.\n\nJe-li heslo kratší než 20 znaků, PIM nesmí být menší než 98 aby byla zachována alespoň minimální úroveň zabezpečení.\nMá-li heslo minimálně 20 znaků, PIM může obsahovat jakoukoliv hodnotu.\n\nHodnota PIM větší než 98 bude mít za následek pomalejší zavádění systému. Malá hodnota PIM (menší než 98) povede k rychlejšímu připojení, ale bude omezeno zabezpečení, není-li heslo dostatečně silné.</entry>
     <entry lang="cs" key="PIM_SYSENC_CHANGE_WARNING">Zapamatovat si číslo pro zavedení systému</entry>
     <entry lang="cs" key="PIM_LARGE_WARNING">Byla vybrána hodnota PIM, která je větší než výchozí hodnota VeraCryptu.\nUvědomte si, že to povede k pomalejšímu připojení/zavedení systému.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="cs" key="PIM_SMALL_WARNING">Byla vybrána hodnota PIM, která je menší než výchozí hodnota VeraCryptu. Uvědomte si, že není-li vaše heslo dostatečně silné, povede to ke slabšímu zabezpečení.\n\nOpravdu si myslíte, že používáte silné heslo?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="cs" key="PIM_SYSENC_TOO_BIG">Maximální hodnota (PIM) pro systémové zašifrování je 65535.</entry>
     <entry lang="cs" key="PIM_TITLE">Svazek PIM</entry>
     <entry lang="cs" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nUPOZORNĚNÍ: v cestě k souborovým klíčům byl nalezen skrytý soubor/y. Tyto skryté soubory nemohou být použity jako souborové klíče. Potřebujete-li je použít jako souborové klíče, změňte jejich vlastnost „Skrytý” (pravým tlačítkem myši na něj klikněte, vyberte „Vlastnosti”, odškrtněte „Skrytý” a potvrďte „OK”). Poznámka: skryté soubory jsou viditelné jen tehdy, je-li daná volba zapnuta („Ovládací panely &gt; Možnosti složky &gt; Zobrazit”).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="cs" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Tento algoritmus není podporován v režimu TrueCrypt.</entry>
     <entry lang="cs" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM není podporován v režimu TrueCrypt.</entry>
     <entry lang="cs" key="PIM_REQUIRE_LONG_PASSWORD">Za účelem použití zadaného PIM musí heslo obsahovat minimálně 20 znaků.\nKratší hesla mohou být použita jen je-li PIM minimálně 485.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="cs" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Za účelem použití zadaného PIM musí heslo pro ověření obsahovat minimálně 20 znaků.\nKratší hesla mohou být použita jen je-li PIM minimálně 98.</entry>
     <entry lang="cs" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Souborové klíče aktuálně nejsou podporovány pro šifrování systémů.</entry>
     <entry lang="cs" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">UPOZORNĚNÍ: VeraCrypt nemohl obnovit původní nastavení klávesnice. To může způsobit, že heslo bude zadáno nesprávně.</entry>

Translations/Language.da.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer > Organize > 'Folder and search options' > View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</entry>
     <entry lang="da" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Advarsel: VeraCrypt kunne ikke gendanne det originale keyboard layout. Dette kan medføre at du indtaster et kodeord ukorrekt.</entry>

Translations/Language.de.xml

@@ -647,10 +647,13 @@
     <entry lang="de" key="PIM_HIDVOL_TITLE">PIM des verste  ckten Volumes</entry>
     <entry lang="de" key="PIM_HIDDEN_OS_TITLE">PIM für verstecktes Betriebssystem</entry>
     <entry lang="de" key="PIM_HELP">Der PIM (Persönlicher Iterationsmultiplikator) ist ein Wert, der die Anzahl der Iterationen für die Kopfdatenschlüsselableitung wie folgt steuert:\n      Iterationen = 15000 + (PIM x 1000).\n\nWird der Wert leer gelassen oder auf 0 gesetzt, benutzt VeraCrypt einen Standardwert (485), der hohe Sicherheit gewährleistet.\n\nWenn das Passwort weniger als 20 Zeichen hat, kann der PIM nicht kleiner als 485 sein, um ein minimales Sicherheitslevel zu gewährleisten.\nWenn das Passwort 20 Zeichen oder mehr hat, kann der PIM beliebig gesetzt werden.\nEin PIM-Wert größer als 485 verlangsamt das Einhängen. Ein niedriger PIM-Wert (kleiner als 485) beschleunigt das Einhängen, kann aber die Sicherheit verringern, wenn ein zu schwaches Passwort gewählt wurde.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="de" key="PIM_SYSENC_HELP">Der PIM (Persönlicher Iterationsmultiplikator) ist ein Wert, der die Anzahl der Iterationen für die Kopfdatenschlüsselableitung wie folgt steuert:\n      Iterationen = PIM x 2048.\n\nWird der Wert leer gelassen oder auf 0 gesetzt, benutzt VeraCrypt einen Standardwert, der hohe Sicherheit gewährleistet.\n\nWenn das Passwort weniger als 20 Zeichen hat, kann der PIM nicht kleiner als 98 sein, um ein minimales Sicherheitslevel zu gewährleisten.\nWenn das Passwort 20 Zeichen oder mehr hat, kann der PIM beliebig gesetzt werden.\nEin PIM-Wert größer als 98 verlangsamt den Bootvorgang. Ein niedriger PIM-Wert (kleiner als 98) beschleunigt den Bootvorgang, kann aber die Sicherheit verringern, wenn ein zu schwaches Passwort gewählt wurde.</entry>
     <entry lang="de" key="PIM_SYSENC_CHANGE_WARNING">MERKEN! Für Bootvorgang</entry>
     <entry lang="de" key="PIM_LARGE_WARNING">Der gewählte PIM-Wert ist größer als der VeraCrypt-Standardwert.\nBitte beachten Sie, dass dies den Einhänge- bzw. Bootvorgang erheblich verlangsamt.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="de" key="PIM_SMALL_WARNING">Der gewählte PIM-Wert (Persönlicher Iterationsmultiplikator) ist kleiner als der VeraCrypt-Standardwert.\nBitte beachten Sie, dass dies die Sicherheit verringern kann, wenn ein zu schwaches Passwort gewählt wurde!\n\nBestätigen Sie, dass Sie ein starkes Passwort gewählt haben?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="de" key="PIM_SYSENC_TOO_BIG">Der größtmögliche Wert für den PIM (Persönlicher Iterationsmultiplikator) ist 65535.</entry>
     <entry lang="de" key="PIM_TITLE">Volume-PIM</entry>
     <entry lang="de" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNUNG: Versteckte Dateien wurden im Suchpfad gefunden. Diese versteckten Dateien können nicht als Schlüsseldateien verwendet werden. Wenn Sie diese Dateien als Schlüsseldateien verwenden möchten, müssen Sie das Attribut „Versteckt“ entfernen (Rechtsklick auf die Datei, „Eigenschaften“ wählen, „Versteckt“ abwählen, „OK“ klicken). Hinweis: Versteckte Dateien sind nur sichtbar, wenn die entsprechende Option im Explorer aktiviert ist („Datei“ &gt; „Ordner- und Suchoptionen ändern“ &gt; „Ansicht“).</entry>
@@ -1107,6 +1110,7 @@
     <entry lang="de" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Dieser Algorithmus ist im TrueCrypt-Modus nicht vorhanden.</entry>
     <entry lang="de" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Persönlicher Iterationsmultiplikator) wird nicht im TrueCrypt-Modus unterstützt.</entry>
     <entry lang="de" key="PIM_REQUIRE_LONG_PASSWORD">Das Passwort muss 20 oder mehr Zeichen haben, um den festgelegten PIM verwenden zu können.\nKürzere Passwörter können nur verwendet werden, wenn der PIM-Wert 485 oder größer ist.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="de" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Das Pre-Boot-Authentifikationspasswort muss 20 oder mehr Zeichen haben, um den festgelegten PIM verwenden zu können.\nKürzere Passwörter können nur verwendet werden, wenn der PIM-Wert 98 oder größer ist.</entry>
     <entry lang="de" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Schlüsseldateien werden derzeit nicht für die Systemverschlüsselung unterstützt.</entry>
     <entry lang="de" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">WARNUNG: VeraCrypt konnte die ursprüngliche Tastaturbelegung nicht wiederherstellen. Dadurch könnten Sie das Passwort falsch eingeben.</entry>

Translations/Language.el.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer > Organize > 'Folder and search options' > View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</entry>
     <entry lang="el" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Προειδοποίηση: Το VeraCrypt δεν μπόρεσε να επαναφέρει την αρχική διάταξη του πληκτρολογίου. Αυτό μπορεί να προκαλέσει εσφαλμένη εισαγωγή κωδικού.</entry>

Translations/Language.es.xml

@@ -644,10 +644,13 @@
     <entry lang="es" key="PIM_HIDVOL_TITLE">PIM Oculto del Volumen</entry>
     <entry lang="es" key="PIM_HIDDEN_OS_TITLE">PIM para el Sistema Operativo Oculto</entry>
     <entry lang="es" key="PIM_HELP">PIM (Personal Iterations Multiplier) es un valor que controla el número de iteraciones usado por la derivación de la llave de cabecera de la siguiente forma:\n      Iteraciones = 15000 + (PIM x 1000).\n\nCuando se deja en blanco o se pone a 0, VeraCrypt usará el valor predeterminado (485) que proporciona una elevada seguridad.\n\nCuando la contraseña es de menos de 20 caracteres, PIM puede ser menor de 485 con el fin de mantener un nivel de seguridad mínimo.\nCuando la contraseña es de 20 ó más caracteres, se puede usar cualquier valor de PIM.\n\nUn valor de PIM superior a 485 conllevará un proceso de montaje más lento. Un valor de PIM (menor de 485) conllevará un proceso de montaje más rápido, pero podría reducir la seguridad si la contraseña no es suficientemente fuerte.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="es" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) es un valor que controla el número de iteraciones usado por la derivación de la clave de cabecera de la siguiente forma:\n Iteraciones = PIM x 2048.\n\nCuando se deja en blanco o se pone a 0, VeraCrypt usuará un valor por defecto que proporciona una elevada seguridad.\n\nCuando la contraseña es inferior a los 20 caracteres, PIM no puede ser inferior a 98 a fin de mantener un nivel de seguridad mínimo.\nCuando la contraseña supera los 20 caracteres o más, se puede usar cualquier valor de PIM.\n\nUn PIM superior a 98 conllevará un proceso de arranque más lento. Un valor pequeño de PIM (menor de 98) llevará consigo un proceso de arranque más rápido, pero podría reducir la seguridad si la contraseña no es suficientemente fuerte.</entry>
     <entry lang="es" key="PIM_SYSENC_CHANGE_WARNING">Recordar Número para Sistema de Arranque</entry>
     <entry lang="es" key="PIM_LARGE_WARNING">Puede elegir un valor de PIM superior al valor por defecto de VeraCrypt.\nPor favor, sea consciente que ello conllevará un arranque/montaje mucho más lento.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="es" key="PIM_SMALL_WARNING">Ha elegido un Multiplicador de Iteraciones Personal (Personal Iterations Multiplier - PIM) que es mucho menor que el que proporciona VeraCrypt por defecto. Por favor, sea consciente que si su contraseña no es lo suficientemente fuerte, podría ver reducido el nivel de seguridad.\n\n¿Está seguro que usa una contraseña fuerte?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="es" key="PIM_SYSENC_TOO_BIG">El valor máximo del Multiplicador de Iteraciones Personal (Personal Iterations Multiplier - PIM) para un sistema de cifrado es de 65535.</entry>
     <entry lang="es" key="PIM_TITLE">PIM de Volumen</entry>
     <entry lang="es" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nAVISO: Se han encontrado archivos ocultos en una ruta de búsqueda de archivos-llave. Estos archivos no pueden ser usados como archivos-llave. Si necesita usarlos como archivos-llave, elimine su atributo 'Oculto' (clic derecho en cada uno, seleccione 'Propiedades', desmarque 'Oculto' y pulse Aceptar). Nota: Los archivos ocultos sólo son visibles si la opción correspondiente está activada (Equipo &gt; Organizar &gt; 'Opciones de carpeta y búsqueda' &gt; Ver).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="es" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Este algoritmo no está soportado para modo TrueCrypt</entry>
     <entry lang="es" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Multiplicador de Iteraciones Personal (Personal Iterations Multiplier - PIM) no soportado para modo TrueCrypt.</entry>
     <entry lang="es" key="PIM_REQUIRE_LONG_PASSWORD">La contraseña debe contener 20 caracteres o más para usar el PIM especificado.\nSólo se pueden usar contraseñas de menor longitud si el PIM es 485 ó más.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="es" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">La contraseña de autenticación de pre-arranque debe contener 20 caracteres o más para usar el PIM especificado.\nSólo se puede usar contraseñas de menor longitud si el PIM es 98 ó más.</entry>
     <entry lang="es" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Los archivos-llave no están soportados actualmente para el cifrado del sistema.</entry>
     <entry lang="es" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">AVISO: VeraCrypt no pudo restaurar la disposición de teclado original. Esto puede hacer que ud. introduzca incorrectamente la contraseña.</entry>

Translations/Language.et.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer > Organize > 'Folder and search options' > View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</entry>
     <entry lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</entry>

Translations/Language.eu.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="eu" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nKONTUZ: Ezkutuko fitxategiak aurkitu dira gako-fitxategiak bilatzeko helbidean. Honako ezkutuko fitxategiak ezin dira gako-fitxategi moduan erabili. Gako-fitxategi moduan erabili nahi badituzu, 'Ezkututa' ezaugarria kendu iezaiezu (eskubiko klik egin, 'Ezaugarriak' aukeratu, 'Ezkututa' marka kendu eta 'Ados' sakatu). Oharra: Ezkutuko fitxategiak hori egiteko aukera gaituta badago bakarrik ikus daitezke (Ordenagailua &gt; Kudeatu &gt; Karpeta eta Bilaketa Aukerak &gt; Ikusi).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="eu" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Momentuz ezin dira gako-fitxategiak erabili sistema zifratzeko.</entry>
     <entry lang="eu" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Kontuz: VeraCrypt-ek ezin izan du teklatua diseinu originaera leheneratu. Honek pasahitza gaizki sartzea ekar dezake.</entry>

Translations/Language.fa.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer &gt; Organize &gt; 'Folder and search options' &gt; View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</entry>
     <entry lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</entry>

Translations/Language.fi.xml

@@ -644,10 +644,13 @@
     <entry lang="fi" key="PIM_HIDVOL_TITLE">Piilotetun taltion PIM</entry>
     <entry lang="fi" key="PIM_HIDDEN_OS_TITLE">Piilotetun käyttöjärjestelmän PIM</entry>
     <entry lang="fi" key="PIM_HELP">PIM (henkilökohtainen iteraatiokerroin) on arvo, joka määrää otsikkoavaimen johtamisalgoritmin käyttämien iterointien lukumäärän seuraavasti:\n      Iteraatiot = 15000 + (PIM x 1000).\n\nKun jätetty tyhjäksi tai 0, VeraCrypt käyttää oletusarvoa (485) mikä takaa korkean turvallisuuden.\n\nKun salasana on alle 20 merkkiä, PIM ei voi olla pienempi kuin 485, jotta alin turvallisuustaso säilytetään.\nKun salasana on 20 merkkiä tai pidempi, PIM:lle voidaan asettaa mikä tahansa arvo.\n\nJos PIM arvo on suurempi kuin arvo 485, se johtaa hitaampaan taltion liittämiseen. Pieni PIM arvo (pienempi kuin 485) johtaa nopeaan liittämiseen, mutta voi heikentää turvallisuutta mikäli salasana ei ole tarpeeksi vahva.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="fi" key="PIM_SYSENC_HELP">PIM (henkilökohtainen iteraatiokerroin) on arvo, joka määrää otsikkoavaimen johtamisalgoritmin käyttämien iterointien lukumäärän seuraavasti:\n Iteraatiot = PIM x 2048.\n\nKun jätetty tyhjäksi tai 0, VeraCrypt käyttää oletusarvoa mikä takaa korkean turvallisuuden.\n\nKun salasana on alle 20 merkkiä, PIM ei voi olla pienempi kuin 98 vähimmäisen turvallisuuden säilyttämiseksi.\nKun salasana on vähintään 20 merkkiä, PIM:lle voidaan asettaa mikä tahansa arvo.\n\nPIM-luku joka ylittää arvon 98 johtaa hitaampaan käynnistykseen. Pienempi PIM-luku (alle 98) johtaa nopeampaan käynnistykseen, mutta se voi heikentää turvallisuutta mikäli salasana ei ole tarpeeksi vahva.</entry>
     <entry lang="fi" key="PIM_SYSENC_CHANGE_WARNING">Muista luku jotta voit käynnistää järjestelmän</entry>
     <entry lang="fi" key="PIM_LARGE_WARNING">Olet valinnut PIM-arvon, joka on suurempi kuin VeraCryptin oletusarvo.\nHuomioi, että tämä johtaa paljon hitaampaan liittämiseen tai käynnistymiseen.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="fi" key="PIM_SMALL_WARNING">Olet valinnut henkilökohtaisen iteraatiokertoimen (PIM), joka on pienempi kuin VeraCryptin oletusarvo. Huomioi, että jos salasanasi ei ole tarpeeksi vahva, tämä voi heikentää tietoturvaa.\n\nVoitko vahvistaa, että käytät varmasti vahvaa salasanaa?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="fi" key="PIM_SYSENC_TOO_BIG">Suurin mahdollinen arvo henkilökohtaiselle iteraatiokertoimelle (PIM) on 65535.</entry>
     <entry lang="fi" key="PIM_TITLE">Taltion PIM</entry>
     <entry lang="fi" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nVAROITUS: Avaintiedostojen polulta löytyy piilotettuja tiedostoja. Tällaisia piilotettuja tiedostoja ei voida käyttää avaintiedostoina. Jos haluat käyttää niitä avaintiedostoina, poista niiden piilotettu attribuutti (napsauta niitä hiiren kakkospainikkeella, valitse 'Ominaisuudet', poista 'Piilotettu' ja napsauta OK). Huomaa: Piilotetut tiedostot ovat näkyvissä vain, jos seuraava asetus on käytössä (Tietokone > Järjestä > 'Kansio ja hakuvalinnat' > View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="fi" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Tämä algoritmi ei ole tuettuna TrueCrypt-tilassa.</entry>
     <entry lang="fi" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (henkilökohtainen iteraatiokerroin) ei ole tuettu TrueCrypt-tilassa.</entry>
     <entry lang="fi" key="PIM_REQUIRE_LONG_PASSWORD">Salasanassa on oltava vähintään 20 merkkiä määritellyn PIM:n käyttämiseksi.\nLyhyempiä salasanoja voidaan käyttää vain, jos PIM on 485 tai suurempi.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="fi" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Esikäynnistys varmistus Salasanan on sisällettävä 20 tai useampia merkkejä määritetyn PIM:n käyttämiseksi.\nLyhyempiä salasanoja voidaan käyttää vain, jos PIM on 98 tai suurempi.</entry>
     <entry lang="fi" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Avaintiedostot eivät ole nykyisin tuettuna järjestelmän salaukselle.</entry>
     <entry lang="fi" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Varoitus: VeraCrypt-ohjelma ei voi palauttaa alkuperäistä näppäimistön ulkoasua. Tämä saattaa johtaa sinun antamasta väärästä salasanasta.</entry>

Translations/Language.fr.xml

@@ -644,10 +644,13 @@
     <entry lang="fr" key="PIM_HIDVOL_TITLE">PIM du volume caché</entry>
     <entry lang="fr" key="PIM_HIDDEN_OS_TITLE">PIM du système d’exploitation caché</entry>
     <entry lang="fr" key="PIM_HELP">PIM (Personal Iterations Multiplier) est une valeur qui contrôle le nombre d’itérations utilisées par la dérivation de clé d’en-tête du volume et cela comme suit:\n      Nombre d’itérations = 15000 + (PIM x 1000)\n\nLorsque ce champs est laissé vide ou définie à 0, VeraCrypt utilisera une valeur par défaut (485) qui assurera un haut niveau de sécurité.\n\nLorsque le mot de passe est inférieure à 20 caractères, le PIM ne peut pas être inférieure à 485 afin de maintenir un niveau de sécurité minimale.\nLorsque le mot de passe contient 20 caractères ou plus, le PIM peut être mis à une valeur quelconque.\n\nUn PIM supérieur à 485 aboutira à une durée de montage plus longue. Une valeur de PIM petite (moins de 485) conduira à un montage plus rapide mais cela peut réduire la sécurité si le mot de passe n’est pas assez fort.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="fr" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) est une valeur qui contrôle le nombre d’itérations utilisées par la dérivation de clé d’en-tête du volume et cela comme suit:\n      Nombre d’itérations = PIM x 2048\n\nLorsque ce champs est laissé vide ou définie à 0, VeraCrypt utilisera une valeur par défaut qui assurera un haut niveau de sécurité.\n\nLorsque le mot de passe est inférieure à 20 caractères, le PIM ne peut pas être inférieure à 98 afin de maintenir un niveau de sécurité minimale.\nLorsque le mot de passe contient 20 caractères ou plus, le PIM peut être mis à une valeur quelconque.\n\nUn PIM supérieur à 98 aboutira à un préamorçage plus lent du système. Une valeur de PIM petite (moins de 98) conduira à un préamorçage plus rapide mais cela peut réduire la sécurité si le mot de passe n’est pas assez fort.</entry>
     <entry lang="fr" key="PIM_SYSENC_CHANGE_WARNING">Veuillez mémoriser cette valeur</entry>
     <entry lang="fr" key="PIM_LARGE_WARNING">Vous avez choisi une valeur de PIM plus grande que la valeur par défaut de VeraCrypt.\nVeuillez noter que cela conduira à une durée plus longue pour le montage/préamorçage.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="fr" key="PIM_SMALL_WARNING">Vous avez choisi une valeur de PIM qui est inférieure à la valeur par défaut de VeraCrypt. Veuillez noter que si votre mot de passe n’est pas assez fort, cela pourrait conduire à une réduction du niveau de sécurité.\n\nEst-ce que vous confirmez que vous utilisez un mot de passe fort?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="fr" key="PIM_SYSENC_TOO_BIG">La valeur maximale du PIM pour le chiffrement système est 65535.</entry>
     <entry lang="fr" key="PIM_TITLE">PIM du volume</entry>
     <entry lang="fr" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nAVERTISSEMENT : Les fichiers cachés ont été trouvés dans un chemin de recherche de fichier de clé. De tels fichiers cachés ne peuvent pas être utilisés comme fichiers clés. Si vous avez besoin de les utiliser comme fichiers clés, enlever leur attribut « Caché » (cliquez-droit sur chacun d’eux, sélectionnez « Propriétés », décochez la case « Caché » et cliquez sur OK). Remarque : Les fichiers cachés sont visibles uniquement si l’option correspondante est activée (Options de dossier &gt; Affichage).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="fr" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Cet algorithme n’est pas supporté pour le mode TrueCrypt.</entry>
     <entry lang="fr" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Le PIM n’est pas supporté pour le mode TrueCrypt.</entry>
     <entry lang="fr" key="PIM_REQUIRE_LONG_PASSWORD">Mot de passe doit contenir au moins 20 caractères pour pouvoir utiliser cette valeur de PIM.\nLes mots de passe plus courts ne peuvent être utilisés que si la PIM est égal à 485 ou supérieur.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="fr" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Le mot de passe de préamorçage doit contenir au moins 20 caractères pour pouvoir utiliser cette valeur de PIM.\nLes mots de passe plus courts ne peuvent être utilisés que si la PIM est égal à 98 ou supérieur.</entry>
     <entry lang="fr" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Les fichiers clés ne sont actuellement pas pris en charge pour le chiffrement du système.</entry>
     <entry lang="fr" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Avertissement : VeraCrypt n’a pas pu restaurer la disposition originale du clavier. Cela peut vous faire saisir votre mot de passe de manière erronée .</entry>

Translations/Language.he.xml

@@ -644,10 +644,13 @@
     <entry lang="he" key="PIM_HIDVOL_TITLE">אמצעי אחסון נסתר PIM</entry>
     <entry lang="he" key="PIM_HIDDEN_OS_TITLE">PIM למערכת הפעלה נסתרת</entry>
     <entry lang="he" key="PIM_HELP">PIM (מכפיל איטרציות אישיות) הוא ערך השולט במספר האיטרציות המשמשות את גזירת מפתח הכותרת באופן הבא: \n איטרציות = 15000+ (PIM x 1000). \n \n כאשר הוא נשאר ריק או מוגדר כ- 0, VeraCrypt ישתמשערך ברירת מחדל (485) המבטיח אבטחה גבוהה. \n \n כאשר הסיסמה קטנה מ -20 תווים, PIM לא יכול להיות קטן מ- 485 על מנת לשמור על רמת אבטחה מינימלית. \n כאשר הסיסמה היא 20 תווים ומעלה, ניתן להגדיר PIM לכל ערך. \n \n ערך PIM גדול מ- 485 יוביל לטעינה איטית יותר.ערך PIM קטן (פחות מ- 485) יוביל לטעינה מהירה יותר אך הוא יכול להפחית את האבטחה אם הסיסמה אינה חזקה מספיק.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="he" key="PIM_SYSENC_HELP">PIM (מכפיל איטרציות אישיות) הוא ערך השולט במספר האיטרציות המשמשות את גזירת מפתח הכותרת באופן הבא: \n איטרציות = PIM x 2048. \n \n כאשר הוא נשאר ריק או מוגדר כ- 0, VeraCrypt ישתמש בערך ברירת מחדלמבטיח אבטחה גבוהה. \n \n כאשר הסיסמה קטנה מ -20 תווים, PIM לא יכול להיות קטן מ- 98 על מנת לשמור על רמת אבטחה מינימלית. \n כאשר הסיסמה היא 20 תווים או יותר, ניתן להגדיר PIM לכלערך. \n \n ערך PIM גדול מ- 98 יוביל לאתחול איטי יותר.ערך PIM קטן (פחות מ 98) יוביל לאתחול מהיר יותר אך הוא יכול להפחית את האבטחה אם הסיסמה אינה חזקה מספיק.</entry>
     <entry lang="he" key="PIM_SYSENC_CHANGE_WARNING">זכור את מספר למערכת האתחול</entry>
     <entry lang="he" key="PIM_LARGE_WARNING">בחרת ערך PIM שגדול מערך ברירת המחדל של VeraCrypt. \n שים לב שהדבר יוביל לטעינה / אתחול איטית בהרבה.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="he" key="PIM_SMALL_WARNING">בחרת במכפיל איטרציות אישי (PIM) שהוא קטן מערך ברירת המחדל של VeraCrypt.שים לב שאם הסיסמה שלך לא מספיק חזקה, זה יכול להוביל לאבטחה חלשה יותר. \n \n האם אתה מאשר שאתה משתמש בסיסמה חזקה?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="he" key="PIM_SYSENC_TOO_BIG">הערך המרבי של מכפיל איטרציות (PIM) להצפנת המערכת הוא 65535.</entry>
     <entry lang="he" key="PIM_TITLE">אמצעי אחסון PIM</entry>
     <entry lang="he" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n \n אזהרה: קבצים מוסתרים נמצאו בנתיב חיפוש מפתחות.לא ניתן להשתמש בקבצים מוסתרים כאלה כקובצי מפתח.אם עליך להשתמש בהם כקובצי מפתח, הסר את מאפיין &amp;apos;מוסתר&amp;apos; (לחץ באמצעות לחצן העכבר הימני על כל אחד מהם, בחר &amp;apos;מאפיינים&amp;apos;, בטל את הסימון של &amp;apos;מוסתר&amp;apos; ולחץ על אישור).הערה: קבצים מוסתרים גלויים רק אם האפשרות המתאימה מופעלת (מחשב&gt; ארגן&gt; &amp;apos;אפשרויות תיקייה וחיפוש&amp;apos;&gt; תצוגה).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="he" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">אלגוריתם זה אינו נתמך במצב TrueCrypt.</entry>
     <entry lang="he" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (מכפיל איטרציות אישי) אינו נתמך במצב TrueCrypt.</entry>
     <entry lang="he" key="PIM_REQUIRE_LONG_PASSWORD">על הסיסמה להכיל 20 תווים או יותר על מנת להשתמש ב- PIM שצוין. \n ניתן להשתמש בסיסמאות קורט רק אם ה- PIM הוא 485 ומעלה.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="he" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">אימות טרום אתחול סיסמה חייבת להכיל 20 תווים או יותר על מנת להשתמש ב- PIM שצוין. \n ניתן להשתמש בסיסמאות קורט רק אם ה- PIM הוא 98 ומעלה.</entry>
     <entry lang="he" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">כרגע אין תמיכה בקובצי מפתח להצפנת המערכת.</entry>
     <entry lang="he" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">אזהרה: VeraCrypt לא הצליח לשחזר את פריסת המקלדת המקורית.זה עלול לגרום לך להזין סיסמה באופן שגוי.</entry>

Translations/Language.hu.xml

@@ -644,10 +644,13 @@
     <entry lang="hu" key="PIM_HIDVOL_TITLE">Rejtett kötet PIM-je</entry>
     <entry lang="hu" key="PIM_HIDDEN_OS_TITLE">Rejtett operációs rendszer PIM értéke</entry>
     <entry lang="hu" key="PIM_HELP">A PIM (személyes iterációk szorzója) egy olyan érték, amely a következőképpen szabályozza a fejléc-kulcs származtatása során használt iterációk számát:\n      Iterációk = 15000 + (PIM x 1000).\n\nHa üresen marad, vagy 0-ra állítja, a VeraCrypt az alapértelmezett értéket (485) fogja használni, amely magasabb biztonsági szintet biztosít.\n\nHa a jelszó kevesebb, mint 20 karakter, a PIM nem lehet kisebb 485-nél a minimális biztonsági szint fenntartása érdekében.\nHa a jelszó legalább 20 karakter, a PIM tetszőleges értékre állítható.\n\nA 485-nál nagyobb PIM-érték lassabb rendszerindítást eredményez. Egy kisebb (485-nél rövidebb) PIM-érték gyorsabb indítást eredményez, de csökkentheti a biztonságot, ha a jelszó nem elég erős.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="hu" key="PIM_SYSENC_HELP">A PIM (személyes iterációk szorzója) egy olyan érték, amely a következőképpen szabályozza a fejléc-kulcs származtatása során használt iterációk számát:\n      Iterációk = PIM x 2048.\n\nHa üresen marad, vagy 0-ra állítja, a VeraCrypt az alapértelmezett értéket fogja használni, amely magasabb biztonsági szintet biztosít.\n\nHa a jelszó kevesebb, mint 20 karakter, a PIM nem lehet kisebb 98-nál a minimális biztonsági szint fenntartása érdekében.\nHa a jelszó legalább 20 karakter, a PIM tetszőleges értékre állítható.\n\nA 98-nál nagyobb PIM-érték lassabb rendszerindítást eredményez. Egy kisebb (98-nál rövidebb) PIM-érték gyorsabb indítást eredményez, de csökkentheti a biztonságot, ha a jelszó nem elég erős.</entry>
     <entry lang="hu" key="PIM_SYSENC_CHANGE_WARNING">Emlékezzen az indítani kívánt rendszer számára</entry>
     <entry lang="hu" key="PIM_LARGE_WARNING">A VeraCrypt alapértelmezett értékénél nagyobb PIM értéket választott.\nFelhívjuk figyelmét, hogy ez sokkal lassabb csatlakoztatást/indítást eredményez.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="hu" key="PIM_SMALL_WARNING">A személyes iterációk szorzóját (PIM) választotta, amely kisebb, mint az alapértelmezett VeraCrypt érték. Vegye figyelembe, ha a jelszó nem elég erős, az gyengébb biztonsági szintet jelenthet.\n\nMegerősíti, hogy erős jelszót használ?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="hu" key="PIM_SYSENC_TOO_BIG">A személyes iterációk szorzó (PIM) maximális értéke a rendszer titkosításánál 65535.</entry>
     <entry lang="hu" key="PIM_TITLE">Kötet PIM</entry>
     <entry lang="hu" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nFIGYELEM: Rejtett fájlok találhatók a kulcsfájl keresési útvonalában. Az ilyen rejtett fájlok nem használhatók kulcsfájlokként. Ha kulcsfájlként kell használni őket, távolítsa el a 'Rejtett' attribútumot (kattintson jobb gombbal mindegyikre, válassza a 'Tulajdonságok' elemet, törölje a jelet a 'Rejtett' jelölőnégyzetből, majd kattintson az OK gombra). Megjegyzés: A rejtett fájlok csak akkor jelennek meg, ha a megfelelő opció engedélyezve van (Számítógép &gt; Rendszerezés &gt; 'Mappa és keresési lehetőségek' &gt; Nézet).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="hu" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Ez az algoritmus nem támogatott a TrueCrypt módban.</entry>
     <entry lang="hu" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">A PIM (személyes iterációk szorzója) nem támogatott a TrueCrypt módban.</entry>
     <entry lang="hu" key="PIM_REQUIRE_LONG_PASSWORD">A megadott PIM használatához a jelszónak legalább 20 karaktert kell tartalmaznia.\nRövidebb jelszavak csak akkor használhatók, ha a PIM 485 vagy nagyobb.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="hu" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">A rendszerindítás előtti hitelesítési jelszónak legalább 20 karaktert kell tartalmaznia a megadott PIM használatához.\nRövidebb jelszavak csak akkor használhatók, ha a PIM 98 vagy annál nagyobb.</entry>
     <entry lang="hu" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">A kulcsfájlok jelenleg nem támogatottak a rendszertitkosításnál.</entry>
     <entry lang="hu" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Figyelem: A VeraCrypt nem tudta visszaállítani az eredeti billentyűzetkiosztást. Ez azt eredményezheti, hogy helytelenül adja meg a jelszót.</entry>

Translations/Language.id.xml

@@ -644,10 +644,13 @@
     <entry lang="id" key="PIM_HIDVOL_TITLE">PIM Volume Tersembunyi</entry>
     <entry lang="id" key="PIM_HIDDEN_OS_TITLE">PIM untuk Sistem Operasi Tersembunyi</entry>
     <entry lang="id" key="PIM_HELP">PIM (Personal Iterations Multiplier) adalah nilai yang mengontrol jumlah iterasi yang digunakan oleh derivasi kunci header sebagai berikut: \n Iterasi = 15000 + (PIM x 1000). \n \n Ketika dibiarkan kosong atau diatur ke 0, VeraCrypt akan menggunakan nilai default (485) yang memastikan keamanan tinggi.  PIM tidak bisa lebih kecil dari 485 untuk mempertahankan tingkat keamanan minimal.\n Ketika kata sandi adalah 20 karakter atau lebih, PIM dapat diatur ke nilai apa pun. Nilai PIM kecil (kurang dari 485) akan mengarah pada pemasangan yang lebih cepat tetapi dapat mengurangi keamanan jika kata sandi tidak cukup kuat.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="id" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) adalah nilai yang mengontrol jumlah iterasi yang digunakan oleh derivasi kunci header sebagai berikut:\n Iterasi = PIM x 2048.\n\n Ketika dibiarkan kosong atau diatur ke 0, VeraCrypt akan menggunakan nilai default yang memastikan keamanan tinggi.\n\nMengapa kata sandi kurang dari 20 karakter, PIM tidak bisa lebih kecil dari 98 untuk mempertahankan tingkat keamanan minimal.\nMeng kata sandinya 20 karakter atau 20 karakter, PIM tidak bisa lebih kecil dari 98 untuk mempertahankan tingkat keamanan minimal. Lebih lanjut, PIM dapat diatur ke nilai apa pun. nilai PIM yang lebih besar dari 98 akan mengarah pada boot yang lebih lambat. Nilai PIM kecil (kurang dari 98) akan mengarah ke boot yang lebih cepat tetapi dapat mengurangi keamanan jika kata sandi tidak cukup kuat.</entry>
     <entry lang="id" key="PIM_SYSENC_CHANGE_WARNING">Ingat Nomor ke Sistem Boot</entry>
     <entry lang="id" key="PIM_LARGE_WARNING">Anda telah memilih nilai PIM yang lebih besar dari nilai baku VeraCrypt.\nHarap catat bahwa ini akan menyebabkan mengait/boot yang jauh lebih lambat.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="id" key="PIM_SMALL_WARNING">Anda telah memilih Personal Iterations Multiplier (PIM) yang lebih kecil dari nilai VeraCrypt default. Harap dicatat bahwa jika kata sandi Anda tidak cukup kuat, ini dapat menyebabkan keamanan yang lebih lemah.</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="id" key="PIM_SYSENC_TOO_BIG">Nilai maksimum Personal Iterations Multiplier (PIM) untuk enkripsi sistem adalah 65535.</entry>
     <entry lang="id" key="PIM_TITLE">PIM Volume</entry>
     <entry lang="id" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: File tersembunyi telah ditemukan di jalur pencarian keyfile. File tersembunyi tersebut tidak dapat digunakan sebagai keyfiles. Jika Anda perlu menggunakannya sebagai keyfiles, hapus atribut 'Tersembunyi' mereka (klik kanan masing-masing dari mereka, pilih 'Properti', hapus centang 'Tersembunyi' dan klik OK). Catatan: File tersembunyi hanya terlihat jika opsi yang sesuai diaktifkan (Komputer &gt; Atur &gt; 'Folder dan opsi pencarian' &gt; View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="id" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Algoritma ini tidak didukung untuk mode TrueCrypt.</entry>
     <entry lang="id" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) tidak didukung untuk mode TrueCrypt.</entry>
     <entry lang="id" key="PIM_REQUIRE_LONG_PASSWORD">Kata sandi harus berisi 20 atau lebih karakter untuk menggunakan PIM yang ditentukan.\nKata sandi yang lebih pendek hanya dapat dipakai bila PIM bernilai 485 atau lebih.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="id" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Kata sandi otentikasi pra-boot harus berisi 20 atau lebih karakter untuk menggunakan KATA SANDI PIM yang ditentukan.</entry>
     <entry lang="id" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Berkas kunci saat ini tidak didukung untuk enkripsi sistem.</entry>
     <entry lang="id" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Peringatan: VeraCrypt tidak dapat memulihkan tata letak papan ketik asli. Hal ini dapat menyebabkan Anda memasukkan kata sandi secara salah.</entry>

Translations/Language.it.xml

@@ -644,10 +644,13 @@
     <entry lang="it" key="PIM_HIDVOL_TITLE">Volume PIM Nascosto</entry>
     <entry lang="it" key="PIM_HIDDEN_OS_TITLE">PIM per Sistema Operativo Nascosto</entry>
     <entry lang="it" key="PIM_HELP">PIM (Moltiplicatore Iterazioni Personale) è un valore che controlla il numero d'iterazioni usate dalle derivazioni della chiave d'intestazione come segue:\nIterazioni =  15000 + (PIM x 1000).\n\nQuando lasciato vuoto o uguale a 0, VeraCrypt sera il valore default (485) che assicura un'elevata sicurezza.\n\nQuando la password è minore di 20 caratteri, PIM non può essere inferiore di 485 in modo da mantenere un livello minimo di sicurezza.\nQuando la password è pi di 20 caratteri, PIM può essere impostato a qualsiasi valore.\n\nUn valore PIM maggiore di 485 comporterà un mount più lento. Un piccolo valore PIM (inferiore di 485) comporterà un mount più veloce ma potrebbe ridurre la sicurezza se la password non è abbastanza robusta.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="it" key="PIM_SYSENC_HELP">IM (Personal Iterations Multiplier) è un valore che controlla il numero di iterazioni usate dalla derivazione della chiave di intestazione come segue:\nIterazioni = PIM x 2048.\n\nQuando lasciato vuoto o impostato su 0, VeraCrypt utilizzerà un valore predefinito che garantisce un'elevata sicurezza.\n\nQuando la password è inferiore a 20 caratteri, PIM non può essere inferiore a 98 per mantenere un livello di sicurezza minimo.\nQuando la password è di 20 caratteri o più, PIM può essere impostato su qualsiasi valore.\n\nUn valore PIM maggiore di 98 comporterà un avvio più lento. Un piccolo valore PIM (inferiore a 98) porterà ad un avvio più rapido ma può ridurre la sicurezza se la password non è abbastanza forte.</entry>
     <entry lang="it" key="PIM_SYSENC_CHANGE_WARNING">Numero ricordato al Boot System</entry>
     <entry lang="it" key="PIM_LARGE_WARNING">Hai scelto un valore PIM che è più grande di quello default di VeraCrypt.\nPrendi nota che questo condurrà ad montaggio/boot più lento.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="it" key="PIM_SMALL_WARNING">Tu hai scelto un valore Moltiplicatore Iterazioni Personale (PIM) che è più piccolo del valore default VeraCrypt. Per favore nota che se la tua password non è abbastanza forte, questo potrebbe portare a una sicurezza più debole.\n\nVuoi confermare che userai una password robusta ?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="it" key="PIM_SYSENC_TOO_BIG">Il valore massimo del Moltiplicatore di Iterazioni Personali (PIM) per la cifratura del sistema è 65535.</entry>
     <entry lang="it" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="it" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nATTENZIONE: dei file nascosti sono stati trovati nel percorso di ricerca del file chiave. Tali file nascosti non possono essere usati come file-chiave. Se avete bisogno di usarli come un file-chiave, rimuovere l'attributo 'Nascosto' (tasto destro del mouse su ogni file, selezionare 'Proprietà' e deselezionare l'attributo 'Nascosto', quindi clic su OK). Nota: I file nascosti sono visibili solo se l'opzione che ne permette la visione è abilitata (Computer &gt; Organizza &gt; 'Opzioni cartelle e ricerca' &gt; Visualizzazione).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="it" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Il volume non è supportato per la modalità TrueCrypt.</entry>
     <entry lang="it" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Moltiplicatore Iterazioni Personali) non è supportato per la modalità TrueCrypt.</entry>
     <entry lang="it" key="PIM_REQUIRE_LONG_PASSWORD">La password deve contenere almeno 20 o più caratteri per poter usare il PIM specificato.\nPassword più corte possono essere usate solo se il PIM è 486 o maggiore.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="it" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">L'autenticazione pre-avvio La password deve contenere 20 o più caratteri per usare il PIM specificato.\nLe password dello sviluppatore possono essere usate solo se il PIM è 98 o superiore.</entry>
     <entry lang="it" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">I file chiave sono attualmente non supportate dalla codifica di sistema.</entry>
     <entry lang="it" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">AVVERTENZA: VeraCrypt non può ripristinare la configurazione originale della tastiera. Questo può causare la digitazione errata della password.</entry>

Translations/Language.ja.xml

@@ -644,10 +644,13 @@
     <entry lang="ja" key="PIM_HIDVOL_TITLE">隠しボリューム PIM</entry>
     <entry lang="ja" key="PIM_HIDDEN_OS_TITLE">隠しオペレーティングシステムの PIM</entry>
     <entry lang="ja" key="PIM_HELP">PIM (Personal Iterations Multiplier) は、ヘッダーキーの導出に使用される反復回数を制御する値です。\n      反復回数 = 15000 + (PIM x 1000)\n\n空欄のままにするか 0 に設定すると、VeraCrypt は高いセキュリティを保証するデフォルト値 (485) を使用します。\n\nパスワードが 20 文字未満の場合、最小限のセキュリティレベルを維持するために PIM を 485 未満にすることはできません。\nパスワードが 20 文字以上の場合、PIM は任意の値に設定できます。\n\n485 より大きい PIM 値はマウントを遅くします。小さい PIM 値 (485 未満) はマウントを速くしますが、パスワードが十分に強力でない場合、セキュリティが低下する可能性があります。</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="ja" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) は、ヘッダーキーの導出に使用される反復回数を制御する値です。\n      反復回数 = PIM x 2048\n\n空欄のままにするか 0 に設定すると、VeraCrypt は高いセキュリティを保証するデフォルト値を使用します。\n\nパスワードが 20 文字未満の場合、最小限のセキュリティレベルを維持するために PIM を 98 未満にすることはできません。\nパスワードが 20 文字以上の場合、PIM は任意の値に設定できます。\n\n98 より大きい PIM 値は起動を遅くします。小さい PIM 値 (98 未満) は起動を速くしますが、パスワードが十分に強力でない場合、セキュリティが低下する可能性があります。</entry>
     <entry lang="ja" key="PIM_SYSENC_CHANGE_WARNING">システムを起動するための数値を忘れないでください</entry>
     <entry lang="ja" key="PIM_LARGE_WARNING">VeraCrypt のデフォルト値よりも大きい PIM 値を選択しました。\nこれにより、マウント/起動が大幅に遅くなることに注意してください。</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="ja" key="PIM_SMALL_WARNING">VeraCrypt のデフォルト値よりも小さい PIM (Personal Iterations Multiplier) を選択しました。パスワードが十分に強力でない場合、セキュリティが低下する可能性があります。\n\n強力なパスワードを使用していることを確認しますか？</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="ja" key="PIM_SYSENC_TOO_BIG">システム暗号化の PIM (Personal Iterations Multiplier) の最大値は 65535 です。</entry>
     <entry lang="ja" key="PIM_TITLE">ボリューム PIM</entry>
     <entry lang="ja" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\n警告：指定フォルダのキーファイル探索中に隠しファイルが見つかりました。このような隠しファイルはキーファイルとして使用されません。キーファイルとして使用したい場合は隠し属性を解除してください（該当ファイルを右クリックしてプロパティを開き、隠しファイルのチェックを外して「OK」をクリックします）。注：隠しファイルはフォルダオプションですべてのファイルを表示する設定になっていないと表示されません。</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="ja" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">このアルゴリズムはTrueCryptモードではサポートされていません。</entry>
     <entry lang="ja" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM（Personal Iterations Multiplier）はTrueCryptモードではサポートされていません。</entry>
     <entry lang="ja" key="PIM_REQUIRE_LONG_PASSWORD">指定されたPIMを使用するには、パスワードは20文字以上でなければなりません。\n短いパスワードは、PIMが485以上の場合にのみ使用できます。</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="ja" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">起動前認証パスワードは、指定されたPIMを使用するためには20文字以上である必要があります。\n短いパスワードは、PIMが98以上の場合にのみ使用できます。</entry>
     <entry lang="ja" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">現在、システムの暗号化でのキーファイル使用には対応していません。</entry>
     <entry lang="ja" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">警告：VeraCryptは元のキーボードレイアウトを復元できませんでした。そのためパスワードを正確に入力できないおそれがあります。</entry>

Translations/Language.ka.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer > Organize > 'Folder and search options' > View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</entry>
     <entry lang="ka" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">გაფრთხილება: VeraCrypt ვერ აღადგენს კლავიატურის ორიგინალ განლაგებას. ამან შესაძლოა პაროლის არასწორი შეტანა გამოიწვიოს.</entry>

Translations/Language.ko.xml

@@ -644,10 +644,13 @@
     <entry lang="ko" key="PIM_HIDVOL_TITLE">숨겨진 볼륨 PIM</entry>
     <entry lang="ko" key="PIM_HIDDEN_OS_TITLE">숨겨진 운영 체제용 PIM</entry>
     <entry lang="ko" key="PIM_HELP">PIM(Personal Iterations Multiplier)은 헤더 키 파생에 사용되는 반복 횟수를 제어하는 값입니다.\n 반복 = 15000 + (PIM x 1000).\n\n비어 두거나 0으로 설정된 경우 VeraCrypt는 높은 보안을 보장하는 기본값(485)을 사용합니다.\n\n암호가 20자 미만인 경우 PIM은 최소 보안 수준을 유지하기 위해 485자 미만이면 안 됩니다.\n암호가 20자 이상인 경우 PIM을 임의의 값으로 설정할 수 있습니다.\n\nPIM 값이 485보다 크면 마운트 속도가 느려집니다. PIM 값이 작으면(485개 미만) 마운트 속도가 빨라지지만 암호의 강도가 충분하지 않으면 보안을 줄일 수 있습니다.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="ko" key="PIM_SYSENC_HELP">PIM(Personal Iterations Multiplier)은 헤더 키 파생에 사용되는 반복 횟수를 제어하는 값입니다.\n 반복 = PIM x 2048\n\n비어 두거나 0으로 설정된 경우 VeraCrypt는 높은 보안을 보장하는 기본값을 사용합니다.\n\n암호가 20자 미만인 경우 PIM은 최소 보안 수준을 유지하기 위해 98자 미만이면 안 됩니다.\n암호가 20자 이상인 경우 PIM을 임의의 값으로 설정할 수 있습니다.\n\nPIM 값이 98보다 크면 부팅 속도가 느려집니다. PIM 값이 작으면 부팅 속도가 빨라지지만 암호가 충분하지 않으면 보안을 줄일 수 있습니다.</entry>
     <entry lang="ko" key="PIM_SYSENC_CHANGE_WARNING">부팅 시스템 번호 기억</entry>
     <entry lang="ko" key="PIM_LARGE_WARNING">VeraCrypt 기본값보다 큰 PIM 값을 선택했습니다.\n이렇게하면 마운트/부팅 속도가 훨씬 느려집니다.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="ko" key="PIM_SMALL_WARNING">기본 VeraCrypt 값보다 작은 PIM (Personal Iterations Multiplier)을 선택했습니다. 비밀번호가 충분하지 않으면 보안이 취약해질 수 있습니다.\n\n강력한 비밀번호를 사용하고 있는지 확인 하시겠습니까?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="ko" key="PIM_SYSENC_TOO_BIG">시스템 암호화의 개인 반복 곱셈기 (PIM) 최대 값은 65535입니다.</entry>
     <entry lang="ko" key="PIM_TITLE">볼륨 PIM</entry>
     <entry lang="ko" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\n경고: 숨김 파일이 키 파일 검색 경로에서 발견되었습니다. 이러한 숨김 파일은 키 파일로 사용할 수 없습니다. 키 파일로 사용해야하는 경우 '숨김'속성을 제거하십시오 (각 속성을 마우스 오른쪽 단추로 클릭하고 '속성'을 선택하고 '숨김'을 선택 취소하고 확인을 클릭하십시오). 참고: 숨김 파일은 해당 옵션이 활성화 된 경우에만 표시됩니다(컴퓨터> 구성> '폴더 및 검색 옵션'>보기).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="ko" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">이 알고리즘은 TrueCrypt 모드에서는 지원되지 않습니다.</entry>
     <entry lang="ko" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">TrueCrypt 모드에서는 PIM(개인 반복 다중 경로)이 지원되지 않습니다.</entry>
     <entry lang="ko" key="PIM_REQUIRE_LONG_PASSWORD">지정된 PIM을 사용하려면 암호가 20자 이상이어야 합니다.\nSorter 암호는 PIM이 485 이상인 경우에만 사용할 수 있습니다.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="ko" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">지정된 PIM을 사용하려면 사전 부트 인증 암호가 20자 이상이어야 합니다.\nSorter 암호는 PIM이 98 이상인 경우에만 사용할 수 있습니다.</entry>
     <entry lang="ko" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">키 파일은 현재 시스템 암호화에 지원되지 않습니다.</entry>
     <entry lang="ko" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">경고: VeraCrypt가 원래 키보드 레이아웃을 복원할 수 없습니다. 이로 인해 암호를 잘못 입력할 수 있습니다.</entry>

Translations/Language.lv.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer > Organize > 'Folder and search options' > View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</entry>
     <entry lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</entry>

Translations/Language.my.xml

@@ -646,10 +646,13 @@
     <entry lang="my" key="PIM_HIDVOL_TITLE">လျှို့ဝှက် Volume PIM</entry>
     <entry lang="my" key="PIM_HIDDEN_OS_TITLE">လျှို့ဝှက် OS အတွက် PIM</entry>
     <entry lang="my" key="PIM_HELP">PIM (တစ်ကိုယ်ရေသုံး ထပ်တလဲလဲပြုလုပ်ခြင်းများ မြှောက်ကိန်း) သည် ခေါင်းစဉ် စကားဝှက်သော့ တစ်ဆင့်ရယူခြင်းက အသုံးပြုသည့် ထပ်တလဲလဲပြုလုပ်ခြင်းများ အရေအတွက်ကို အောက်ပါအတိုင်း ထိန်းချုပ်သည့် တန်ဖိုးတစ်ခု ဖြစ်သည် -\n ထပ်တလဲလဲပြုလုပ်ခြင်းများ = 15000 + (PIM x 1000)။\n\nအလွတ်အတိုင်း ချန်ထားလျှင် သို့မဟုတ် 0 အဖြစ် သတ်မှတ်ထားလျှင် VeraCrypt သည် လုံခြုံရေးမြင့်ကြောင်း သေချာစေသည့် နဂိုမူလတန်ဖိုး (၄၈၅) ကို အသုံးပြုပါမည်။\n\nစကားဝှက်သည် စာလုံး ၂၀ အောက်ရှိသောအခါ အနည်းဆုံးရှိသင့်သော လုံခြုံရေးအဆင့်ကို ထိန်းသိမ်းရန်အတွက် PIM သည် ၄၈၅ အောက် မငယ်ရပါ။\nစကားဝှက်သည် စာလုံး ၂၀ နှင့်အထက် ရှိသောအခါ PIM ကို မည်သည့်တန်ဖိုးမဆို သတ်မှတ်နိုင်သည်။\n\nPIM တန်ဖိုးသည် ၄၈၅ ထက်ကြီးလျှင် အစပျိုးရာတွင် နှေးပါမည်။ PIM တန်ဖိုးငယ်လျှင် (၄၈၅ အောက်နည်းလျှင်) အစပျိုးရာတွင် မြန်သော်လည်း စကားဝှက်ခိုင်မာမှုနည်းပါက လုံခြုံမှု လျော့နည်းနိုင်သည်။</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="my" key="PIM_SYSENC_HELP">PIM (တစ်ကိုယ်ရေသုံး ထပ်တလဲလဲပြုလုပ်ခြင်းများ မြှောက်ကိန်း) သည် ခေါင်းစဉ် စကားဝှက်သော့ တစ်ဆင့်ရယူခြင်းက အသုံးပြုသည့် ထပ်တလဲလဲပြုလုပ်ခြင်းများ အရေအတွက်ကို အောက်ပါအတိုင်း ထိန်းချုပ်သည့် တန်ဖိုးတစ်ခု ဖြစ်သည် -\n ထပ်တလဲလဲပြုလုပ်ခြင်းများ = PIM x 2048။\n\nအလွတ်အတိုင်း ချန်ထားလျှင် သို့မဟုတ် 0 အဖြစ် သတ်မှတ်ထားလျှင် VeraCrypt သည် လုံခြုံရေးမြင့်ကြောင်း သေချာစေသည့် နဂိုမူလတန်ဖိုးကို အသုံးပြုပါမည်။\n\nစကားဝှက်သည် စာလုံး ၂၀ အောက်ရှိသောအခါ အနည်းဆုံးရှိသင့်သော လုံခြုံရေးအဆင့်ကို ထိန်းသိမ်းရန်အတွက် PIM သည် ၉၈ အောက် မငယ်ရပါ။\nစကားဝှက်သည် စာလုံး ၂၀ နှင့်အထက် ရှိသောအခါ PIM ကို မည်သည့်တန်ဖိုးမဆို သတ်မှတ်နိုင်သည်။\n\nPIM တန်ဖိုးသည် ၉၈ ထက်ကြီးလျှင် စတင်အလုပ်လုပ်ရာတွင်နှေးပါမည်။ PIM တန်ဖိုးငယ်လျှင် (၉၈ အောက်နည်းလျှင်) စတင်အလုပ်လုပ်ရာတွင်မြန်သော်လည်း စကားဝှက်ခိုင်မာမှုနည်းပါက လုံခြုံမှု လျော့နည်းနိုင်သည်။</entry>
     <entry lang="my" key="PIM_SYSENC_CHANGE_WARNING">စနစ် စတင်အလုပ်လုပ်ရန် နံပါတ်ကို မှတ်ထားပါ</entry>
     <entry lang="my" key="PIM_LARGE_WARNING">သင်သည် VeraCrypt နဂိုမူလတန်ဖိုးထက်ကြီးသော PIM တန်ဖိုးကို ရွေးထားသည်။\nယင်းကြောင့် အစပျိုးခြင်း/စတင်အလုပ်လုပ်ခြင်း များစွာပိုနှေးနိုင်ကြောင်း ကျေးဇူးပြု၍ သတိပြုပါ။</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="my" key="PIM_SMALL_WARNING">သင်သည် နဂိုမူလ VeraCrypt တန်ဖိုးအောက်ငယ်သော တစ်ကိုယ်ရေသုံး ထပ်တလဲလဲပြုလုပ်ခြင်းများ မြှောက်ကိန်း (PIM) ကို ရွေးချယ်ထားသည်။ သင့်စကားဝှက်သည် လုံလောက်စွာမခိုင်မာပါက လုံခြုံရေး ပိုအားနည်းနိုင်ကြောင်း ကျေးဇူးပြု၍ သတိပြုပါ။\n\nသင်သည် ခိုင်မာသော စကားဝှက်ကို အသုံးပြုနေကြောင်း အတည်ပြုပါသလား။</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="my" key="PIM_SYSENC_TOO_BIG">စနစ် ကုဒ်ဖြင့်ပြောင်းလဲမှုအတွက် တစ်ကိုယ်ရေ ထပ်တလဲလဲပြုလုပ်ခြင်းများ မြှောက်ကိန်း (PIM) အများဆုံးတန်ဖိုးမှာ ၆၅၅၃၅ ဖြစ်သည်။</entry>
     <entry lang="my" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="my" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nသတိပေးချက် - လျှို့ဝှက် ဖိုင်(များ)ကို ကီးဖိုင် ရှာဖွေရေး လမ်းကြောင်း၌ တွေ့ရှိရသည်။ ယင်းကဲ့သို့ လျှို့ဝှက် ဖိုင်များကို ကီးဖိုင်အဖြစ် သုံးစွဲ၍ မရပါ။ ၄င်းတို့ကို ကီးဖိုင်များ အဖြစ် သုံးစွဲလိုပါက၊ ၄င်းတို့၏ 'Hidden' သတ်မှတ်ချက်ကို ဖယ်ရှားလိုက်ပါ (၄င်းတို့ကို ညာဖက် နှိပ်ပါ၊ 'Properties' ကို ရွေး၊ 'Hidden' အမှန်ခြစ်ကို ​ဖြုတ်ပြီး OK နှိပ်လိုက်ပါ)။ မှတ်ချက် - လျှို့ဝှက် ဖိုင်များသည် အကယ်၍ သက်ဆိုင်ရာ ရွေးစရာ (Computer &gt; Organize &gt; 'Folder and search options' &gt; View)ကို ဖွင့်ထားမှသာ မြင်နိုင်သည်။</entry>
@@ -1106,6 +1109,7 @@
     <entry lang="my" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">ဤအယ်လဂိုရီသမ်ကို TrueCrypt မုဒ်အတွက် ပံ့ပိုးမထားပါ။</entry>
     <entry lang="my" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (တစ်ကိုယ်ရေသုံး ထပ်တလဲလဲပြုခြင်းများ မြှောက်ကိန်း) ကို TrueCrypt မုဒ်အတွက် ပံ့ပိုးမထားပါ။</entry>
     <entry lang="my" key="PIM_REQUIRE_LONG_PASSWORD">ဖော်ပြထားသော PIM ကို အသုံးပြုရန်အတွက် စကားဝှက်သည် စာလုံး ၂၀ နှင့်အထက် ရှိရပါမည်။\nPIM သည် ၄၈၅ နှင့်အထက် ရှိမှသာ ပိုတိုသော စကားဝှက်များကို အသုံးပြုနိုင်ပါသည်။</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="my" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">ဖော်ပြထားသော PIM ကို အသုံးပြုရန်အတွက် စတင်အလုပ်မလုပ်မီ စစ်မှန်ကြောင်းသက်သေပြသည့် စကားဝှက်သည် စာလုံး ၂၀ နှင့်အထက် ရှိရပါမည်။\nPIM သည် ၉၈ နှင့်အထက် ရှိမှသာ ပိုတိုသော စကားဝှက်များကို အသုံးပြုနိုင်ပါသည်။</entry>
     <entry lang="my" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">ကီးဖိုင်များသည် လောလောဆယ် ကွန်ပျူတာစနစ် စာဝှက်ခြင်းအတွက် ထောက်ပံ့မပေးပါ။​</entry>
     <entry lang="my" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">သတိပေးချက် - VeraCrypt သည် မူရင်း ​ကီးဘုတ် လေးအောက်ကို နဂိုအတိုင်း ပြန်မထားနိုင်ပါ။ ဤအချက်ကြောင့် စကားဝှက်ကို မှားယွင်းစွာ ရေးထည့်မိနိုင်သည်။</entry>

Translations/Language.nb.xml

@@ -644,10 +644,13 @@
     <entry lang="nb" key="PIM_HIDVOL_TITLE">PIM til Skjult Volum</entry>
     <entry lang="nb" key="PIM_HIDDEN_OS_TITLE">PIM for Skjult Operativsystem</entry>
     <entry lang="nb" key="PIM_HELP">PIM (Personal Iterations Multiplier) er en verdi som styrer antall iterasjoner som brukes av header nøkkel avledningen som følger:\n      Iterasjoner = 15000 + (PIM x 1000).\n\nNår den er tom eller satt til 0, vil VeraCrypt bruke en standardverdi (485) som sikrer høy sikkerhet.\n\nNår passordet er mindre enn 20 tegn, kan ikke PIM være mindre enn 485 for å opprettholde minimalsikkerhetsnivå.\nNår passordet er 20 tegn eller mer, kan PIM settes til hvilken som helst verdi.\n\nEn PIM-verdi større enn 485 vil føre til langsommere montering. En liten PIM-verdi (mindre enn 485) vil føre til raskere montering, men det kan redusere sikkerheten hvis passordet ikke er sterkt nok.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="nb" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) er en verdi som styrer antall iterasjoner som brukes av header nøkkel avledningen som følger:\n      Iterasjoner = PIM x 2048.\n\nNår den er tom eller satt til 0, vil VeraCrypt bruke en standardverdi som sikrer høy sikkerhet.\n\nNår passordet er mindre enn 20 tegn, kan ikke PIM være mindre enn 98 for å opprettholde minimalsikkerhetsnivå.\nNår passordet er 20 tegn eller mer, kan PIM settes til hvilken som helst verdi.\n\nEn PIM-verdi større enn 98 vil føre til langsommere oppstart. En liten PIM-verdi (mindre enn 98) vil føre til raskere oppstart, men det kan redusere sikkerheten hvis passordet ikke er sterkt nok.</entry>
     <entry lang="nb" key="PIM_SYSENC_CHANGE_WARNING">Husk nummeret til å starte systemet</entry>
     <entry lang="nb" key="PIM_LARGE_WARNING">Du har valgt en PIM-verdi som er større enn VeraCrypt standardverdi.\nVennligst merk at dette vil føre til mye langsommere montering/oppstart.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="nb" key="PIM_SMALL_WARNING">Du har valgt en Personlig Iterasjon Multiplier (PIM) som er mindre enn den standard VeraCrypt verdien. Vennligst merk at hvis passordet ditt ikke er sterkt nok, kan dette føre til redusert sikkerhet.\n\nBekrefter du at du bruker et sterkt passord?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="nb" key="PIM_SYSENC_TOO_BIG">Maksimalverdi for Personlig Iterasjon Multiplier (PIM) for systemkryptering er 65535.</entry>
     <entry lang="nb" key="PIM_TITLE">Volum PIM</entry>
     <entry lang="nb" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nADVARSEL: Skjulte filer har blitt funnet i en nøkkelfilsøkesti. Slike skjulte filer kan ikke brukes som nøkkelfiler. Hvis du trenger å bruke dem som nøkkelfiler, fjern deres 'Skjult'-attributt (høyreklikk hver av dem, velg 'Egenskaper', fjern 'Skjult' og klikk OK). Merk: Skjulte filer er synlige bare hvis det tilsvarende alternativet er aktivert (Datamaskin > Organiser > 'Mappe- og søkealternativer' > Visning).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="nb" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Denne algoritmen støttes ikke for TrueCrypt-modus.</entry>
     <entry lang="nb" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personlig Iterations Multiplier) støttes ikke for TrueCrypt-modus.</entry>
     <entry lang="nb" key="PIM_REQUIRE_LONG_PASSWORD">Passordet må inneholde 20 eller flere tegn for å bruke den oppgitte PIM.\nKortere passord kan kun brukes hvis PIM er 485 eller høyere.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="nb" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot autentiseringspassordet må inneholde 20 eller flere tegn for å bruke den angitte PIM.\nKortere passord kan kun brukes hvis PIM er 98 eller høyere.</entry>
     <entry lang="nb" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Nøkkelfiler støttes foreløpig ikke for systemkryptering.</entry>
     <entry lang="nb" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Advarsel: VeraCrypt kunne ikke gjenopprette den opprinnelige tastaturoppsettet. Dette kan føre til at du skriver inn passordet feil.</entry>

Translations/Language.nl.xml

@@ -644,10 +644,13 @@
     <entry lang="nl" key="PIM_HIDVOL_TITLE">Verborgen volume PIM</entry>
     <entry lang="nl" key="PIM_HIDDEN_OS_TITLE">PIM voor het verborgen besturingssysteem</entry>
     <entry lang="nl" key="PIM_HELP">PIM (Personal Iterations Multiplier) is een waarde die het aantal iteraties dat door de header key-afleiding wordt gebruikt als volgt bepaalt:\n      Iteraties = 15000 + (PIM x 1000).\n\nIndien leeg of op 0 gezet, zal VeraCrypt een standaard waarde (485) gebruiken die een hoge veiligheid garandeert.\n\nWanneer het wachtwoord minder dan 20 tekens lang is, kan PIM niet kleiner zijn dan 485 om een minimaal beveiligingsniveau te handhaven.\nWanneer het wachtwoord 20 tekens of meer bedraagt, kan PIM op elke waarde worden ingesteld.\n\nEen PIM-waarde groter dan 485 leidt tot een tragere koppeling. Een kleine PIM-waarde (minder dan 485) zal leiden tot een snellere koppeling, maar het kan de veiligheid verminderen als het wachtwoord niet sterk genoeg is.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="nl" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is een waarde die het aantal iteraties dat door de header-sleutel-afleiding wordt gebruikt als volgt bepaalt:\n      Iteraties = PIM x 2048.\n\nIndien leeg gelaten of op 0 gezet, zal VeraCrypt een standaard waarde gebruiken die een hoge veiligheid garandeert.\n\nWanneer het wachtwoord minder dan 20 tekens lang is, kan PIM niet kleiner zijn dan 98 om een minimaal beveiligingsniveau te handhaven.\nWanneer het wachtwoord 20 tekens of meer bedraagt, kan PIM op elke waarde worden ingesteld.\n\nEen PIM-waarde groter dan 98 leidt tot een tragere start. Een kleine PIM-waarde (minder dan 98) zal leiden tot een snellere start, maar het kan de veiligheid verminderen als het wachtwoord niet sterk genoeg is.</entry>
     <entry lang="nl" key="PIM_SYSENC_CHANGE_WARNING">Onthoud het nummer om het systeem op te starten</entry>
     <entry lang="nl" key="PIM_LARGE_WARNING">U hebt een PIM-waarde gekozen die groter is dan de standaardwaarde van VeraCrypt.\nMerk op dat dit zal leiden tot een veel tragere koppeling/opstart.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="nl" key="PIM_SMALL_WARNING">U heeft gekozen voor een Personal Iterations Multiplier (PIM) die kleiner is dan de standaard VeraCrypt-waarde. Houd er rekening mee dat als uw wachtwoord niet sterk genoeg is, dit kan leiden tot een zwakkere beveiliging.\n\nBevestigt u dat u een sterk wachtwoord gebruikt?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="nl" key="PIM_SYSENC_TOO_BIG">De maximale waarde voor Personal Iterations Multiplier (PIM) voor systeemversleuteling is 65535.</entry>
     <entry lang="nl" key="PIM_TITLE">PIM volume</entry>
     <entry lang="nl" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWAARSCHUWING: verborgen bestand(en) gevonden in een zoekpad voor sleutelbestanden. Zulke verborgen bestanden kunnen niet gebruikt worden als sleutelbestanden. Als u ze als sleutelbestanden wilt gebruiken, verwijder dan hun eigenschap 'verborgen' (klik met de rechtermuisknop op elk bestand, selecteer 'eigenschappen', vink 'verborgen' uit en klik op OK). Opmerking: verborgen bestanden zijn alleen zichtbaar als de overeenkomstige optie is ingeschakeld (computer &gt; organiseren &gt; 'map- en zoekopties' &gt; beeld).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="nl" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Dit algoritme wordt niet ondersteund voor de TrueCrypt-modus.</entry>
     <entry lang="nl" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) wordt niet ondersteund voor de TrueCrypt-modus.</entry>
     <entry lang="nl" key="PIM_REQUIRE_LONG_PASSWORD">Het wachtwoord moet 20 of meer tekens bevatten om de opgegeven PIM te kunnen gebruiken.\nKortere wachtwoorden kunnen alleen worden gebruikt als de PIM 485 of hoger is.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="nl" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Het pre-boot-authenticatiewachtwoord moet 20 of meer tekens bevatten om de opgegeven PIM te kunnen gebruiken.\nKortere wachtwoorden kunnen alleen worden gebruikt als de PIM 98 of meer tekens bevat.</entry>
     <entry lang="nl" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Sleutelbestanden worden momenteel niet ondersteund voor systeemversleuteling.</entry>
     <entry lang="nl" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Waarschuwing: VeraCrypt kon de oorspronkelijke toetsenbordindeling niet herstellen. Dit kan ertoe leiden dat u een verkeerd wachtwoord invoert.</entry>

Translations/Language.nn.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer > Organize > 'Folder and search options' > View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</entry>
     <entry lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</entry>

Translations/Language.pl.xml

@@ -644,10 +644,13 @@
     <entry lang="pl" key="PIM_HIDVOL_TITLE">PIM ukrytego wolumenu</entry>
     <entry lang="pl" key="PIM_HIDDEN_OS_TITLE">PIM ukrytego systemu operacyjnego</entry>
     <entry lang="pl" key="PIM_HELP">PIM (Personal Iterations Multiplier), czyli mnożnik osobistych iteracji, to wartość, która następująco kontroluje liczbę iteracji używanych przez derywację klucza nagłówka:\n		Iteracje = 15000 + (PIM x 1000).\n\nGdy pozostawione puste lub ustawione na 0, VeraCrypt użyje wartości domyślnej (485), która zapewnia wysokie bezpieczeństwo.\nGdy hasło jest krótsze niż 20 znaków, PIM nie może być mniejszy niż 485, aby zapewnić minimalny poziom bezpieczeństwa.\nGdy hasło ma 20 znaków lub więcej, PIM może mieć dowolną wartość.\nWartość PIM większa niż 485 spowoduje wolniejsze podłączanie, mała wartość PIM (mniejsza niż 485) spowoduje szybsze podłączanie, ale może zmniejszyć poziom bezpieczeństwa, gdy hasło nie jest wystarczająco silne.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="pl" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier), czyli mnożnik osobistych iteracji, to wartość, która następująco kontroluje liczbę iteracji używanych przez derywację klucza nagłówka:\n		Iteracje = PIM x 2048.\n\nGdy pozostawione puste lub ustawione na 0, VeraCrypt użyje wartości domyślnej, która zapewnia wysokie bezpieczeństwo.\nGdy hasło jest krótsze niż 20 znaków, PIM nie może być mniejszy niż 98, aby zapewnić minimalny poziom bezpieczeństwa.\nGdy hasło ma 20 znaków lub więcej, PIM może mieć dowolną wartość.\nWartość PIM większa niż 98 spowoduje wolniejsze podłączanie, mała wartość PIM (mniejsza niż 98) spowoduje szybsze podłączanie, ale może zmniejszyć poziom bezpieczeństwa, gdy hasło nie jest wystarczająco silne.</entry>
     <entry lang="pl" key="PIM_SYSENC_CHANGE_WARNING">Zapamiętaj liczbę do uruchomienia systemu</entry>
     <entry lang="pl" key="PIM_LARGE_WARNING">Wybrałeś wartość PIM, która jest większa niż standardowa wartość VeraCrypt.\nProszę zauważyć, że doprowadzi to do znacznie wolniejszego podłączania lub uruchamiania.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="pl" key="PIM_SMALL_WARNING">Wybrałeś PIM, który jest mniejszy niż podstawowa wartość VeraCrypt. Proszę zauważyć, że jeżeli twoje hasło nie jest wystarczająco mocne, moze to doprowadzić do osłabienia bezpieczeństwa.\n\nCzy potwierdzasz użycie silnego hasła?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="pl" key="PIM_SYSENC_TOO_BIG">Maksymalna wartość PIM dla szyfrowania systemu wynosi 65535.</entry>
     <entry lang="pl" key="PIM_TITLE">PIM wolumenu</entry>
     <entry lang="pl" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nOSTRZEŻENIE: Odnaleziono pliki ukryte na ścieżce wyszukiwaniu plików-kluczy. Takie pliki nie moga zostać użyte jako pliki-klucze. Jeśli potrzebujesz ich jako plików-kluczy, usuń atrybut 'ukryty' (kliknij prawym przyciskiem myszki na każdym z nich, wybierz 'Właściwości', odznacz 'Ukryty' i wciśnij OK). Sugestia: Pliki ukryte widoczne są tylko jeśli włączona jest odpowiednia opcja (Komputer &gt; Organizuj &gt; 'Opcje folderów i wyszukiwania' &gt; Widok).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="pl" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Ten algorytm nie jest obsługiwany w trybie TrueCrypt.</entry>
     <entry lang="pl" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM nie obsługuje trybu TrueCrypt.</entry>
     <entry lang="pl" key="PIM_REQUIRE_LONG_PASSWORD">Hasło musi zawierać przynajmniej 20 albo więcej znaków, aby móc używać określonego PIM.\nKrótsze hasła mogą być używane tylko wtedy, gdy PIM wynosi 485 albo więcej.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="pl" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Hasło uwierzytelniania przed uruchomieniem musi zawierać 20 albo więcej znaków, aby móc używać określonego PIM.\nKrótsze hasła mogą być używane tylko wtedy, gdy PIM wynosi 98 albo więcej.</entry>
     <entry lang="pl" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Pliki-klucze nie są obecnie obsługiwane/wspierane do szyfrowania systemu.</entry>
     <entry lang="pl" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Ostrzeżenie: Program VeraCrypt nie mógł odtworzyć oryginalnych ustawień klawiatury. To może spowodować błędne wprowadzenie hasła.</entry>

Translations/Language.pt-br.xml

@@ -644,10 +644,13 @@
     <entry lang="pt-br" key="PIM_HIDVOL_TITLE">PIM do Volume Oculto</entry>
     <entry lang="pt-br" key="PIM_HIDDEN_OS_TITLE">PIM para o Sistema Operacional Oculto</entry>
     <entry lang="pt-br" key="PIM_HELP">PIM (Multiplicador de Iterações Pessoais) é um valor que controla o número de iterações usadas na derivação da chave do cabeçalho, conforme a fórmula:\n      Iterações = 15000 + (PIM x 1000).\n\nQuando deixado vazio ou definido como 0, o VeraCrypt usará um valor padrão (485) que garante alta segurança.\n\nSe a senha tiver menos de 20 caracteres, o PIM não pode ser menor que 485 para manter o nível mínimo de segurança.\nSe a senha tiver 20 caracteres ou mais, o PIM pode ser definido para qualquer valor.\n\nUm PIM maior que 485 resultará em montagem mais lenta. Um PIM menor que 485 resultará em montagem mais rápida, mas poderá reduzir a segurança caso a senha não seja suficientemente forte.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="pt-br" key="PIM_SYSENC_HELP">PIM (Multiplicador de Iterações Pessoais) é um valor que controla o número de iterações usadas na derivação da chave do cabeçalho, conforme a fórmula:\n      Iterações = PIM x 2048.\n\nQuando deixado vazio ou definido como 0, o VeraCrypt usará um valor padrão que garante alta segurança.\n\nSe a senha tiver menos de 20 caracteres, o PIM não pode ser menor que 98 para manter o nível mínimo de segurança.\nSe a senha tiver 20 caracteres ou mais, o PIM pode ser definido para qualquer valor.\n\nUm PIM maior que 98 resultará em inicialização mais lenta. Um PIM menor que 98 resultará em inicialização mais rápida, mas poderá reduzir a segurança caso a senha não seja suficientemente forte.</entry>
     <entry lang="pt-br" key="PIM_SYSENC_CHANGE_WARNING">Lembre-se do Número para Inicializar o Sistema</entry>
     <entry lang="pt-br" key="PIM_LARGE_WARNING">Você escolheu um valor de PIM maior que o valor padrão do VeraCrypt.\nObserve que isso resultará em montagem ou inicialização significativamente mais lenta.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="pt-br" key="PIM_SMALL_WARNING">Você escolheu um Multiplicador de Iterações Pessoais (PIM) menor que o valor padrão do VeraCrypt. Observe que, se sua senha não for suficientemente forte, isso poderá reduzir a segurança.\n\nVocê confirma que está usando uma senha forte?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="pt-br" key="PIM_SYSENC_TOO_BIG">O valor máximo do Multiplicador de Iterações Pessoais (PIM) para criptografia de sistema é 65535.</entry>
     <entry lang="pt-br" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="pt-br" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nAVISO: Arquivos ocultos foram encontrados em um caminho de pesquisa de arquivos de chave. Arquivos ocultos não podem ser usados como arquivo de chave. Se precisar usá-los como arquivo de chave, remova o atributo 'Oculto' (clique com o botão direito em cada arquivo, selecione 'Propriedades', desmarque 'Oculto' e clique em OK). Nota: Arquivos ocultos são visíveis apenas se a opção correspondente estiver ativada (Computador > Organizar > 'Opções de pasta e pesquisa' > Exibir).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="pt-br" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Este algoritmo não é suportado no modo TrueCrypt.</entry>
     <entry lang="pt-br" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Multiplicador Pessoal de Iterações) não é compatível com o modo TrueCrypt.</entry>
     <entry lang="pt-br" key="PIM_REQUIRE_LONG_PASSWORD">A senha deve conter 20 ou mais caracteres para usar o PIM especificado.\nSenhas mais curtas só podem ser usadas se o PIM for 485 ou superior.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="pt-br" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">A senha de autenticação pré-inicialização deve conter 20 ou mais caracteres para usar o PIM especificado.\nSenhas mais curtas só podem ser usadas se o PIM for 98 ou superior.</entry>
     <entry lang="pt-br" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Arquivos-chave atualmente não são suportados para criptografia do sistema.</entry>
     <entry lang="pt-br" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Aviso: O VeraCrypt não conseguiu restaurar o layout original do teclado. Isto poderá fazê-lo digitar a senha incorretamente.</entry>

Translations/Language.ro.xml

@@ -644,10 +644,13 @@
     <entry lang="ro" key="PIM_HIDVOL_TITLE">MIP volum ascuns</entry>
     <entry lang="ro" key="PIM_HIDDEN_OS_TITLE">MIP pentru sistemul de operare ascuns</entry>
     <entry lang="ro" key="PIM_HELP">MIP (Multiplicator Iterații Personal) este o valoare care stabilește numărul de iterații folosit de către cheia de derivare a antetului după cum urmează:\n      Iterații = 15000 + (MIP x 1000).\n\nDacă e lăsat gol sau cu valoarea 0, VeraCrypt va utiliza valoarea implicită (485) ce asigură o securitate sporită.\n\nDacă parola are mai puțin de 20 de caractere, valoarea MIP nu poate fi mai mică de 485 pentru a asigura un nivel de securitate minim.\nDacă parola are 20 de caractere sau mai multe, MIP poate fi setat cu orice valoare.\n\nO valoare a MIP mai mare de 485 va determina o durată de montare mai îndelungată. O valoare mai mică a MIP (mai puțin de 485) va duce la o montare mai rapidă dar poate reduce securitatea dacă parola nu este suficient de puternică.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="ro" key="PIM_SYSENC_HELP">MIP (Multiplicator Iterații Personal) este o valoare care stabilește numărul de iterații folosit de către cheia de derivare a antetului după cum urmează:\n      Iterații = MIP x 2048.\n\nDacă e lăsat gol sau cu valoarea 0, VeraCrypt va utiliza valoarea implicită (98) ce asigură o securitate sporită.\n\nDacă parola are mai puțin de 20 de caractere, valoarea MIP nu poate fi mai mică de 98 pentru a asigura un nivel de securitate minim.\nDacă parola are 20 de caractere sau mai multe, MIP poate fi setat cu orice valoare.\n\nO valoare a MIP mai mare de 98 va determina o întârziere mai îndelungată a pornirii sistemului. O valoare mai mică a MIP (mai puțin de 98) va duce la o pornire mai rapidă dar poate reduce securitatea dacă parola nu este suficient de puternică.</entry>
     <entry lang="ro" key="PIM_SYSENC_CHANGE_WARNING">Rețineți numărul pentru a porni sistemul</entry>
     <entry lang="ro" key="PIM_LARGE_WARNING">Ați ales o valoare a MIP mai mare decât valoarea implicită a VeraCrypt.\nAceasta va determina o pornire mult mai înceată a sistemului sau montare a volumelor.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="ro" key="PIM_SMALL_WARNING">Ați ales o valoare a MIP care este mai mică decât valoarea implicită a VeraCrypt. Dacă parola nu este suficient de puternică, aceasta ar putea determina o securitate mai slabă.\n\nConfirmați că utilizați o parolă puternică?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="ro" key="PIM_SYSENC_TOO_BIG">Valoarea maximă a MIP (Multiplicator Iterații Personal) pentru criptarea sistemului este 65535.</entry>
     <entry lang="ro" key="PIM_TITLE">MIP volum</entry>
     <entry lang="ro" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nATENȚIE: A fost găsit unul sau mai multe fișiere ascunse în calea de căutare a fișierului cheie. Astfel de fișiere ascunse nu pot fi folosite ca fișiere-cheie. Dacă doriți să le folosiți ca fișiere-cheie, ștergeți-le atributul „Ascuns” (apăsați cu clic dreapta pe fiecare din ele, selectați „Properties”, debifați „Hidden” și apoi apăsați pe «OK»). Notă: Fișierele ascunse sunt vizibile numai dacă opțiunea corespunzătoare este activată („Computer” > „Organize” > „Folder and search options” > „View”).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="ro" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Acest algoritm nu este suportat pentru modul TrueCrypt.</entry>
     <entry lang="ro" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">MIP (Multiplicator Iterații Personal) nu este suportat în modul TrueCrypt.</entry>
     <entry lang="ro" key="PIM_REQUIRE_LONG_PASSWORD">Parola trebuie să conțină 20 sau mai multe caractere pentru a putea folosi valoarea MIP specificată.\nParolele mai scurte pot fi folosite doar dacă MIP este 485 sau mai mare.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="ro" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Parola de autentificare la pornire trebuie să conțină 20 sau mai multe caractere pentru a putea folosi valoarea MIP specificată.\nParolele mai scurte pot fi folosite doar dacă MIP este 98 sau mai mare.</entry>
     <entry lang="ro" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Fișierele-cheie nu sunt momentan suportate pentru criptarea partiției sistem.</entry>
     <entry lang="ro" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Avertizare: VeraCrypt nu a putut restaura formatul original al tastaturii. Aceasta au putea determina introducerea greșită a parolei.</entry>

Translations/Language.ru.xml

@@ -644,10 +644,13 @@
     <entry lang="ru" key="PIM_HIDVOL_TITLE">PIM скрытого тома</entry>
     <entry lang="ru" key="PIM_HIDDEN_OS_TITLE">PIM скрытой ОС</entry>
     <entry lang="ru" key="PIM_HELP">PIM (персональный множитель итераций) - это значение, управляющее количеством итераций для формирования ключа заголовка.\n        Итерации = 15000 + (PIM x 1000).\n\nЕсли пусто или равно нулю, то используется стандартное значение (485), обеспечивающее высокую надёжность.\n\nЕсли пароль короче 20 символов, PIM не может быть меньше 485, чтобы гарантировать минимальный уровень защиты.\nДля пароля из 20 и более символов PIM может быть любым.\n\nPIM более 485 замедляет монтирование. При меньшем PIM (до 485) монтирование ускоряется, но снижается надёжность, если пароль недостаточно сложный.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="ru" key="PIM_SYSENC_HELP">PIM (персональный множитель итераций) - это значение, управляющее количеством итераций для формирования ключа заголовка.\n        Итерации = PIM x 2048.\n\nЕсли пусто или равно нулю, будет использоваться стандартное значение, обеспечивающее высокую надёжность.\n\nЕсли пароль короче 20 символов, PIM не может быть меньше 98, чтобы гарантировать минимальный уровень защиты.\nДля пароля из 20 и более символов PIM может быть любым.\n\nPIM более 98 замедляет загрузку. При меньшем PIM (до 98) загрузка ускоряется, но снижается надёжность, если пароль недостаточно сложный.</entry>
     <entry lang="ru" key="PIM_SYSENC_CHANGE_WARNING">Запомните число для загрузки системы</entry>
     <entry lang="ru" key="PIM_LARGE_WARNING">Выбранный PIM - больше стандартного.\nЭто значительно замедлит монтирование/загрузку.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="ru" key="PIM_SMALL_WARNING">Выбранный PIM - меньше стандартного. Если ваш пароль недостаточно надёжен, это может ослабить защиту.\n\nПодтверждаете, что пароль надёжный?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="ru" key="PIM_SYSENC_TOO_BIG">Максимальный PIM для шифрования системы - 65 535.</entry>
     <entry lang="ru" key="PIM_TITLE">PIM тома</entry>
     <entry lang="ru" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nВнимание! В пути поиска ключевых файлов обнаружены скрытые файлы. Скрытые файлы не могут быть ключевыми. Если вы хотите использовать их как ключевые, снимите у них атрибут "Скрытый" (на каждом из них щёлкните правой кнопкой мыши, выберите "Свойства", снимите флажок "Скрытый" и нажмите OK). Учтите, что скрытые файлы видны только при соответствующей системной настройке (Компьютер &gt; Сервис &gt; Параметры папок (Свойства папки) &gt; Вид).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="ru" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Этот алгоритм не поддерживается в режиме TrueCrypt.</entry>
     <entry lang="ru" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (персональный множитель итераций) не поддерживается в режиме TrueCrypt.</entry>
     <entry lang="ru" key="PIM_REQUIRE_LONG_PASSWORD">Для использования указанного PIM пароль должен быть не короче 20 символов.\nБолее короткие пароли можно применять только с PIM не менее 485.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="ru" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Для использования указанного PIM пароль предзагрузочной аутентификации должен быть не короче 20 символов.\nБолее короткие пароли можно использовать только с PIM не менее 98.</entry>
     <entry lang="ru" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Сейчас ключевые файлы для шифрования системы не поддерживаются.</entry>
     <entry lang="ru" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">ВНИМАНИЕ: VeraCrypt не удалось восстановить первоначальную раскладку клавиатуры. Это может привести к неправильному вводу пароля.</entry>

Translations/Language.sk.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer > Organize > 'Folder and search options' > View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</entry>
     <entry lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</entry>

Translations/Language.sl.xml

@@ -644,10 +644,13 @@
     <entry lang="sl" key="PIM_HIDVOL_TITLE">PIM skritega nosilca</entry>
     <entry lang="sl" key="PIM_HIDDEN_OS_TITLE">PIM skritega operacijskega sistema</entry>
     <entry lang="sl" key="PIM_HELP">PIM (Personal Iterations Multiplier) je vrednost, ki nadzoruje število iteracij,ki jih uporabljajo izpeljave ključa glave, kot sledi:\n      Iteracij = 15000 + (PIM x 1000).\n\nČe je leva stran prazna ali 0, bo VeraCrypt uporabil privzeto vrednost (485), ki zagotavlja visoko varnost.\n\nČe ima geslo manj kot 20 znakov, PIM ne  more biti manjši od 485, da imamo zagotovljeno minimalno varnost.\nČe ima geslo 20 ali več znakov, lahko PIM nastavimo na poljubno vrednost.\n\nVrednost PIM večja od 485 bo upočasnila proklop. Manjša vrednost PIM (manj od 485) pospeši priklop a zmanjša varnost, če geslo ni dovolj močno.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="sl" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) je vrednost, ki nadzira število iteracij, ki jih uporablja izpeljava ključa glave, kot sledi:\n Iteracij = PIM x 2048.\n\nČe ostane prazno ali nastavljeno na 0, bo VeraCrypt uporabil privzeto vrednost, ki zagotavlja visoko varnost.\n\nČe je geslo krajše od 20 znakov, PIM ne sme biti manjši od 98, da se ohrani minimalna raven varnosti.\nČe ima geslo 20 znakov ali več, lahko PIM nastaviš na poljubno vrednost.\n\nVrednost PIM, večja od 98, povzroči počasnejši zagon. Majhna vrednost PIM (manj kot 98) bo povzročila hitrejši zagon, vendar lahko zmanjša varnost, če geslo ni dovolj močno.</entry>
     <entry lang="sl" key="PIM_SYSENC_CHANGE_WARNING">Zapomni si številko za zagon sistema</entry>
     <entry lang="sl" key="PIM_LARGE_WARNING">Izbral si vrednost PIM, ki je večja od privzete vrednosti VeraCrypt.\nUpoštevaj, da bo to povzročilo veliko počasnejšo namestitev/zagon.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="sl" key="PIM_SMALL_WARNING">Izbral si osebni množitelj ponovitev (PIM), ki je manjši od privzete vrednosti VeraCrypt. Upoštevaj, da če tvoje geslo ni dovolj močno, lahko to povzroči šibkejšo varnost.\n\nAli potrjuješ, da uporabljaš močno geslo?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="sl" key="PIM_SYSENC_TOO_BIG">Največja vrednost množitelja osebnih ponovitev (PIM) za sistemsko šifriranje je 65535.</entry>
     <entry lang="sl" key="PIM_TITLE">PIM nosilca</entry>
     <entry lang="sl" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nOPOZORILO: Na iskalni poti ključne datoteke so bile najdene skrite datoteke. Takih skritih datotek ni mogoče uporabiti kot ključne datoteke. Če jih želiš uporabiti kot ključne datoteke, odstrani njihov atribut 'Hidden' (z desno miškino tipko klikni vsako od njih, izberi 'Properties', počisti polje 'Hidden' in klikni OK). Opomba: Skrite datoteke so vidne samo, če je omogočena ustrezna možnost (Računalnik > Organiziraj > 'Možnosti mape in iskanja' > Pogled).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="sl" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Ta algoritem ni podprt za način TrueCrypt.</entry>
     <entry lang="sl" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) ni podprt v načinu TrueCrypt.</entry>
     <entry lang="sl" key="PIM_REQUIRE_LONG_PASSWORD">Geslo mora vsebovati 20 ali več znakov, če želite uporabiti navedeni PIM.\nKrajša gesla je mogoče uporabiti le, če je PIM 485 ali višji.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="sl" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Preverjanje pristnosti pred zagonom Geslo mora vsebovati 20 ali več znakov, če želiš uporabiti navedeni PIM.\nKrajša gesla je mogoče uporabiti samo, če je PIM 98 ali več.</entry>
     <entry lang="sl" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Ključne datoteke trenutno niso podprte za sistemsko šifriranje.</entry>
     <entry lang="sl" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Opozorilo: VeraCrypt ni mogel obnoviti prvotne postavitve tipkovnice. Zaradi tega lahko vneseš napačno geslo.</entry>

Translations/Language.sv.xml

@@ -644,10 +644,13 @@
     <entry lang="sv" key="PIM_HIDVOL_TITLE">Dold volym-PIM</entry>
     <entry lang="sv" key="PIM_HIDDEN_OS_TITLE">PIM för dolt operativsystem</entry>
     <entry lang="sv" key="PIM_HELP">PIM (personlig iterationsmultiplikator) är ett värde som styr antalet iterationer som används av huvudnyckelhärledningen enligt följande:\n      Iterationer = 15 000 + (PIM x 1000).\n\nNär det lämnas tomt eller ställs in på 0, kommer VeraCrypt att använda ett standardvärde (485) som garanterar en hög säkerhet.\n\nNär lösenordet är mindre än 20 tecken kan PIM inte vara mindre än 485 för att bibehålla en minimal säkerhetsnivå.\nNär lösenordet är 20 tecken eller mer, PIM kan ställas in på vilket värde som helst.\n\nEtt PIM-värde större än 485 leder till långsammare montering. Ett litet PIM-värde (mindre än 485) kommer att leda till en snabbare montering men det kan minska säkerheten om lösenordet inte är tillräckligt starkt.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="sv" key="PIM_SYSENC_HELP">PIM (personlig iterationsmultiplikator) är ett värde som kontrollerar antalet iterationer som används av huvudnyckelns härledning enligt följande:\n      Iterationer = PIM x 2048.\n\nNär det lämnas tomt eller inställt på 0, kommer VeraCrypt att använda ett standardvärde som garanterar en hög säkerhet.\n\nNär lösenordet är mindre än 20 tecken kan PIM inte vara mindre än 98 för att bibehålla en minimal säkerhetsnivå.\nNär lösenordet är 20 tecken eller mer kan PIM ställas in på valfri värde.\n\nEtt PIM-värde större än 98 leder till långsammare uppstart. Ett litet PIM-värde (mindre än 98) kommer att leda till en snabbare uppstart men det kan minska säkerheten om lösenordet inte är tillräckligt starkt.</entry>
     <entry lang="sv" key="PIM_SYSENC_CHANGE_WARNING">Kom ihåg numret för att starta systemet</entry>
     <entry lang="sv" key="PIM_LARGE_WARNING">Du har valt ett PIM-värde som är större än VeraCrypts standardvärde.\nObservera att detta kommer att leda till mycket långsammare montering/start.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="sv" key="PIM_SMALL_WARNING">Du har valt en personlig iterationsmultiplikator (PIM) som är mindre än VeraCrypt-värdet. Observera att om ditt lösenord inte är tillräckligt starkt kan detta leda till en svagare säkerhet.\n\nBekräftar du att du använder ett starkt lösenord?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="sv" key="PIM_SYSENC_TOO_BIG">Personlig iterationsmultiplikator (PIM) maxvärdet för systemkryptering är 65535.</entry>
     <entry lang="sv" key="PIM_TITLE">Volym-PIM</entry>
     <entry lang="sv" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nVARNING: Dold fil/dolda filer har hittats i en sökväg för nyckelfil. Sådana dolda filer kan inte användas som nyckelfiler. Om du behöver använda dem som nyckelfiler, ta bort deras "Dold"-attribut (högerklicka på var och en av dem, välj "Egenskaper", avmarkera "Dold" och klicka på OK). Obs: Dolda filer är endast synliga om motsvarande alternativ är aktiverat (Dator > Organisera > "Mapp- och sökalternativ" &gt; Visa).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="sv" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Den här algoritmen stöds inte för TrueCrypt-läge.</entry>
     <entry lang="sv" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (personlig iterationsmultiplikator) stöds inte för TrueCrypt-läge.</entry>
     <entry lang="sv" key="PIM_REQUIRE_LONG_PASSWORD">Lösenordet måste innehålla 20 eller fler tecken för att använda den angivna PIM.\nKortare lösenord kan endast användas om PIM är 485 eller högre.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="sv" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Autentiseringenslösenordet före start måste innehålla 20 eller fler tecken för att använda den angivna PIM.\nKortare lösenord kan endast användas om PIM är 98 eller högre.</entry>
     <entry lang="sv" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Nyckelfiler stöds för närvarande inte vid systemkryptering.</entry>
     <entry lang="sv" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Varning: VeraCrypt kunde inte återställa den ursprungliga tangentbordslayouten. Detta kan orsaka att du anger ett felaktigt lösenord.</entry>

Translations/Language.th.xml

@@ -644,10 +644,13 @@
     <entry lang="th" key="PIM_HIDVOL_TITLE">PIM ของไดรฟ์ที่ซ่อน</entry>
     <entry lang="th" key="PIM_HIDDEN_OS_TITLE">PIM สำหรับระบบปฏิบัติการที่ซ่อน</entry>
     <entry lang="th" key="PIM_HELP">PIM (Personal Iterations Multiplier) เป็นค่าที่ควบคุมจำนวนรอบที่ใช้ในการสกัดกั้นคีย์ต้นฉบับดังนี้:\n      Iterations = 15000 + (PIM x 1000).\n\nเมื่อทิ้งว่างหรือกำหนดให้อยู่ที่ 0, VeraCrypt จะใช้ค่าเริ่มต้น (485) ที่รับรองความปลอดภัยสูงอยู่แล้ว\n\nหากรหัสผ่านน้อยกว่า 20 ตัวอักษร, PIM ไม่สามารถน้อยกว่า 485 เพื่อรักษาระดับความปลอดภัยขั้นต่ำ\nหากรหัสผ่านมี 20 ตัวอักษรหรือนานกว่านั้น, PIM สามารถตั้งค่าได้ทุกค่า\n\nค่า PIM ที่มากกว่า 485 จะนำไปสู่การเมานท์ที่ช้ากว่า ค่า PIM ขนาดเล็ก (น้อยกว่า 485) จะทำให้เมานท์เร็วขึ้นแต่จะลดความปลอดภัยหากรหัสผ่านไม่แข็งแรงพอ</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="th" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) เป็นค่าที่ควบคุมจำนวนรอบที่ใช้ในการสกัดกั้นคีย์ต้นฉบับดังนี้:\n      Iterations = PIM x 2048.\n\nเมื่อทิ้งว่างหรือกำหนดให้อยู่ที่ 0, VeraCrypt จะใช้ค่าเริ่มต้นที่รับรองความปลอดภัยสูง\n\nหากรหัสผ่านน้อยกว่า 20 ตัวอักษร, PIM ไม่สามารถน้อยกว่า 98 เพื่อรักษาระดับความปลอดภัยขั้นต่ำ\nหากรหัสผ่านมี 20 ตัวอักษรหรือนานกว่านั้น, PIM สามารถตั้งค่าได้ทุกค่า\n\nค่า PIM ที่มากกว่า 98 จะนำไปสู่การบูตที่ช้ากว่า ค่า PIM ขนาดเล็ก (น้อยกว่า 98) จะทำให้บูตเร็วขึ้นแต่จะลดความปลอดภัยหากรหัสผ่านไม่แข็งแรงพอ</entry>
     <entry lang="th" key="PIM_SYSENC_CHANGE_WARNING">จำจำนวนเพื่อบูตระบบ</entry>
     <entry lang="th" key="PIM_LARGE_WARNING">คุณได้เลือกค่า PIM ที่มากกว่าค่าเริ่มต้นของ VeraCrypt\nโปรดทราบว่าสิ่งนี้จะนำไปสู่การเมานท์/บูตที่ช้ากว่ามาก</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="th" key="PIM_SMALL_WARNING">คุณได้เลือก Personal Iterations Multiplier (PIM) ที่น้อยกว่าค่าเริ่มต้นของ VeraCrypt โปรดทราบว่าหากรหัสผ่านของคุณไม่แข็งแรงเพียงพอ สิ่งนี้อาจส่งผลให้ความปลอดภัยลดลง\n\nคุณยืนยันว่าคุณใช้รหัสผ่านที่แข็งแรงหรือไม่?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="th" key="PIM_SYSENC_TOO_BIG">ค่าสูงสุดของ Personal Iterations Multiplier (PIM) สำหรับการเข้ารหัสระบบคือ 65535</entry>
     <entry lang="th" key="PIM_TITLE">PIM ของไดรฟ์</entry>
     <entry lang="th" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nคำเตือน: พบไฟล์ที่ซ่อนในเส้นทางการค้นหาคีย์ไฟล์ ไฟล์ที่ซ่อนไม่สามารถใช้เป็นคีย์ไฟล์ได้ หากคุณต้องการใช้เป็นคีย์ไฟล์ ให้ลบคุณสมบัติ 'ซ่อน' ออก (คลิกขวาที่แต่ละไฟล์, เลือก 'คุณสมบัติ', ยกเลิกเลือก 'ซ่อน' และคลิกตกลง) หมายเหตุ: ไฟล์ที่ซ่อนมองเห็นได้เฉพาะเมื่อเปิดตัวเลือกที่เกี่ยวข้อง (คอมพิวเตอร์ > จัดระเบียบ > 'ตัวเลือกโฟลเดอร์และการค้นหา' > มุมมอง)</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="th" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">อัลกอริธึมนี้ไม่รองรับสำหรับโหมด TrueCrypt.</entry>
     <entry lang="th" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (ตัวคูณการวนซ้ำส่วนบุคคล) ไม่รองรับสำหรับโหมด TrueCrypt.</entry>
     <entry lang="th" key="PIM_REQUIRE_LONG_PASSWORD">รหัสผ่านต้องมีอักขระ 20 หลักขึ้นไปเพื่อใช้ PIM ที่ระบุ.\nรหัสผ่านที่สั้นกว่าจะใช้ได้ก็ต่อเมื่อ PIM มีค่า 485 หรือมากกว่า.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="th" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">รหัสผ่านก่อนบูทต้องมีอักขระ 20 หลักขึ้นไปเพื่อใช้ PIM ที่ระบุ.\nรหัสผ่านที่สั้นกว่าจะใช้ได้ก็ต่อเมื่อ PIM มีค่า 98 หรือมากกว่า.</entry>
     <entry lang="th" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">ไฟล์คีย์ยังไม่รองรับสำหรับการเข้ารหัสระบบ.</entry>
     <entry lang="th" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">คำเตือน: VeraCrypt ไม่สามารถคืนการเรียงลำดับแป้นพิมพ์เดิมได้. สิ่งนี้อาจทำให้คุณป้อนรหัสผ่านไม่ถูกต้อง.</entry>

Translations/Language.tr.xml

@@ -644,10 +644,13 @@
     <entry lang="tr" key="PIM_HIDVOL_TITLE">Gizli birim kişisel çevrim çarpanı</entry>
     <entry lang="tr" key="PIM_HIDDEN_OS_TITLE">Gizli işletim sistemi kişisel çevrim çarpanı</entry>
     <entry lang="tr" key="PIM_HELP">Kişisel çevrim çarpanı (PIM) değeri, üst bilgi anahtar türetme algoritması tarafından kullanılan çevrim sayısını şu şekilde kontrol eder:\n Çevrim = 15000 + (PIM x 1000).\n\nBoş bırakıldığında veya 0 olarak ayarlandığında VeraCrypt şunu yüksek güvenlik sağlayan varsayılan değeri (485) kullanır.\n\nParolanın uzunluğu 20 karakterden az olduğunda, en düşük güvenlik düzeyini korumak için PIM 485 değerinden küçük olamaz.\nParola uzunluğu 20 karakter veya daha fazla olduğunda, PIM herhangi bir değere ayarlanabilir.\n\n485 değerinden büyük bir PIM, bağlanmanın yavaşlamasına neden olur. Küçük bir PIM değeri (485 değerinden küçük) daha hızlı bir bağlanma sağlar ancak parola yeterince güçlü değilse güvenliği azaltabilir.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="tr" key="PIM_SYSENC_HELP">Kişisel çevrim çarpanı (PIM) değeri, üst bilgi anahtar türetme algoritması tarafından kullanılan çevrim sayısını şu şekilde kontrol eder:\n Çevrim = PIM x 2048.\n\nBoş bırakıldığında veya 0 olarak ayarlandığında VeraCrypt yüksek güvenlik sağlayan varsayılan değeri kullanır.\n\nParolanın uzunluğu 20 karakterden az olduğunda, en düşük güvenlik düzeyini korumak için PIM 98 değerinden küçük olamaz.\nParola uzunluğu 20 karakter veya daha fazla olduğunda, PIM herhangi bir değere ayarlanabilir.\n\n98 değerinden büyük bir PIM, başlatmanın yavaşlamasına neden olur. Küçük bir PIM değeri (98 değerinden küçük) daha hızlı bir başlatma sağlar ancak parola yeterince güçlü değilse güvenliği azaltabilir.</entry>
     <entry lang="tr" key="PIM_SYSENC_CHANGE_WARNING">Birimi başlatmak için numara anımsansın</entry>
     <entry lang="tr" key="PIM_LARGE_WARNING">Varsayılan VeraCrypt değerinden daha büyük bir kişisel çevrim çarpanı (PIM) değeri seçtiniz.\nLütfen bu değerin bağlanma ya da başlatmanın çok daha yavaş olmasına yol açacağını unutmayın.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="tr" key="PIM_SMALL_WARNING">Varsayılan VeraCrypt değerinden daha küçük bir kişisel çevrim çarpanı (PIM) seçtiniz. Lütfen parolanızın yeterince güçlü olmaması durumunda güvenliğin zayıflayabileceğini unutmayın.\n\nGüçlü bir parola kullandığınızı onaylıyor musunuz?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="tr" key="PIM_SYSENC_TOO_BIG">Sistem şifrelemesi için kişisel çevrim çarpanının (PIM) en büyük değeri 65535 olabilir.</entry>
     <entry lang="tr" key="PIM_TITLE">Birimin kişisel çevrim çarpanı</entry>
     <entry lang="tr" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nUYARI: Anahtar dosya arama yolunda gizli dosyalar bulundu. Bu tür gizli dosyalar anahtar dosyalar olarak kullanılamaz. Bunları anahtar dosya olarak kullanmanız gerekiyorsa, 'Gizli' özelliklerini kaldırın (her birine sağ tıklayın, 'Özellikler' üzerine tıklayın, 'Gizli' kutusundaki işareti kaldırın ve 'Tamam' üzerine tıklayın). Not: Gizli dosyalar yalnızca ilgili seçenek etkinleştirildiğinde görünür ('Bilgisayar' &gt; 'Organize et' &gt; 'Klasör ve arama seçenekleri' &gt; 'Görüntüle').</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="tr" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Bu algoritma TrueCrypt kipinde desteklenmiyor.</entry>
     <entry lang="tr" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">KÇÇ (Kişisel Çevrim Çarpanı, PIM) TrueCrypt kipinde desteklenmiyor.</entry>
     <entry lang="tr" key="PIM_REQUIRE_LONG_PASSWORD">Belirtilen KÇÇ değerinin kullanılabilmesi için parola 20 ya da daha fazla karakterden oluşmalıdır.\nDaha kısa parolalar için KÇÇ değeri 485 ya da daha büyük olmalıdır.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="tr" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Belirtilen KÇÇ değerinin kullanılabilmesi için başlatma öncesi kimlik doğrulaması parolası 20 ya da daha fazla karakterden oluşmalıdır.\nDaha kısa parolalar için KÇÇ değeri 98 ya da daha büyük olmalıdır.</entry>
     <entry lang="tr" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Şu anda sistem şifrelemesi için anahtar dosyaları desteklenmiyor.</entry>
     <entry lang="tr" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Uyarı: VeraCrypt özgün klavye düzenini geri yükleyemedi. Bu durum, parolayı yanlış yazmanıza neden olabilir.</entry>

Translations/Language.uk.xml

@@ -644,10 +644,13 @@
     <entry lang="uk" key="PIM_HIDVOL_TITLE">PIM прихованого тому</entry>
     <entry lang="uk" key="PIM_HIDDEN_OS_TITLE">PIM для прихованої операційної системи</entry>
     <entry lang="uk" key="PIM_HELP">PIM (Приватний Множник Ітерацій) - це величина, яка контролює кількість ітерацій, використовуваних для виведення ключа заголовка наступним чином:\n      Ітерації = 15000 + (PIM x 1000).\n\nЯкщо залишити порожнім або встановити на 0, VeraCrypt буде використовувати значення за замовчуванням (485), яке забезпечує високий рівень безпеки.\n\nЯкщо пароль менше 20 символів, PIM не може бути менше 485, щоб підтримувати мінімальний рівень безпеки.\nЯкщо пароль містить 20 або більше символів, PIM може бути встановлений на будь-яке значення.\n\nЗначення PIM більше 485 призведе до повільнішого монтування. Маленьке значення PIM (менше 485) призведе до швидшого монтування, але може знизити безпеку, якщо пароль недостатньо сильний.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="uk" key="PIM_SYSENC_HELP">PIM (Приватний Множник Ітерацій) - це величина, яка контролює кількість ітерацій, використовуваних для виведення ключа заголовка наступним чином:\n      Ітерації = PIM x 2048.\n\nЯкщо залишити порожнім або встановити на 0, VeraCrypt буде використовувати значення за замовчуванням, яке забезпечує високий рівень безпеки.\n\nЯкщо пароль менше 20 символів, PIM не може бути менше 98, щоб підтримувати мінімальний рівень безпеки.\nЯкщо пароль містить 20 або більше символів, PIM може бути встановлений на будь-яке значення.\n\nЗначення PIM більше 98 призведе до повільнішого завантаження. Маленьке значення PIM (менше 98) призведе до швидшого завантаження, але може знизити безпеку, якщо пароль недостатньо сильний.</entry>
     <entry lang="uk" key="PIM_SYSENC_CHANGE_WARNING">Запам’ятайте номер для завантаження системи</entry>
     <entry lang="uk" key="PIM_LARGE_WARNING">Ви вибрали значення PIM, яке більше значення за замовчуванням у VeraCrypt.\nБудь ласка, зверніть увагу, що це призведе до значно повільнішого монтування/завантаження.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="uk" key="PIM_SMALL_WARNING">Ви вибрали Приватний Множник Ітерацій (PIM), який менший за значення за замовчуванням у VeraCrypt. Будь ласка, зверніть увагу, що якщо ваш пароль недостатньо сильний, це може спричинити меншу безпеку.\n\nВи підтверджуєте, що використовуєте сильний пароль?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="uk" key="PIM_SYSENC_TOO_BIG">Максимальне значення Приватного Множника Ітерацій (PIM) для системного шифрування становить 65535.</entry>
     <entry lang="uk" key="PIM_TITLE">PIM тому</entry>
     <entry lang="uk" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nУвага! У шляху пошуку ключових файлів виявлені приховані файли. Приховані файли не можуть бути ключовими. Якщо ви бажаєте використовувати їх як ключові, зніміть у них атрибут 'Прихований' (на кожному з них правою кнопкою миші, виберіть 'Властивості', зніміть прапорець 'Прихований' і натисніть ГАРАЗД). Врахуйте, що приховані файли видно тільки при відповідному системному налаштуванні (Комп'ютер &gt; Сервіс &gt; Параметри тек (Властивості теки) &gt; Вигляд).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="uk" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">Цей алгоритм не підтримується в режимі TrueCrypt.</entry>
     <entry lang="uk" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Персональний множник ітерацій) не підтримується в режимі TrueCrypt.</entry>
     <entry lang="uk" key="PIM_REQUIRE_LONG_PASSWORD">Пароль повинен містити 20 або більше символів для використання вказаного PIM.\nКоротші паролі можна використовувати лише якщо PIM становить 485 або більше.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="uk" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Пароль автентифікації до завантаження повинен містити 20 або більше символів для використання вказаного PIM.\nКоротші паролі можна використовувати лише якщо PIM становить 98 або більше.</entry>
     <entry lang="uk" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">В даний момент ключові файли для шифрування системи не підтримуються.</entry>
     <entry lang="uk" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Увага! VeraCrypt не може відновити первісну розкладку клавіатури. Це може призвести до неправильного введення пароля.</entry>

Translations/Language.uz.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer > Organize > 'Folder and search options' > View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="uz" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">В настоящий момент ключевые файлы для шифрования системы не поддерживаются.</entry>
     <entry lang="uz" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Внимание! VeraCrypt не может восстановить первоначальную раскладку клавиатуры. Это может привести к неправильному вводу пароля.</entry>

Translations/Language.vi.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer > Organize > 'Folder and search options' > View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="vi" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Các tập tin khóa hiện không được hỗ trợ cho việc mã hóa hệ thống.</entry>
     <entry lang="vi" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Cảnh báo: VeraCrypt không thể hồi phục bố trí bàn phím gốc được. Chuyện này có thể làm cho bạn đánh mật mã không đúng vào.</entry>

Translations/Language.zh-cn.xml

@@ -645,10 +645,13 @@
     <entry lang="zh-cn" key="PIM_HIDVOL_TITLE">隐藏卷 PIM</entry>
     <entry lang="zh-cn" key="PIM_HIDDEN_OS_TITLE">隐形操作系统 PIM</entry>
     <entry lang="zh-cn" key="PIM_HELP">PIM (自定迭代次数) 是一个控制头部密钥迭代次数的值，当导出头部密钥时会像这样使用：\n      迭代次数 = 15000 + (PIM x 1000) \n\n当这个值留空或设为0时，VeraCrypt会使用默认值(485)来确保安全性。\n\n当使用20位以下的密码时，为了保证维持最小的安全性，PIM的值不能小于485。\n当使用20位以上的密码时，PIM的值可以任意自定。\n\nPIM大于485可能导致加密卷的挂载速度下降。PIM小于485可能会提高挂载速度，但是如果您的密码强度不足，这会降低安全性。</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="zh-cn" key="PIM_SYSENC_HELP">PIM (自定迭代次数) 是一个控制头部密钥迭代次数的值，当导出头部密钥时会向这样使用：\n      迭代次数 = (PIM x 2048) \n\n当这个值留空或设为0时，VeraCrypt会使用默认值(98)来确保安全性。\n\n当使用20位以下的密码时，为了保证维持最小的安全性，PIM的值不能小于98。\n当使用20位以上的密码时，PIM的值可以任意自定。\n\nPIM大于98可能导致启动速度下降。PIM小于485可能会提高启动速度，但是如果您的密码强度不足，这会降低安全性。</entry>
     <entry lang="zh-cn" key="PIM_SYSENC_CHANGE_WARNING">记住所启动的系统的PIM</entry>
     <entry lang="zh-cn" key="PIM_LARGE_WARNING">您选择了一个大于VeraCrypt默认值的PIM。\n注意这可能使挂载/启动速度下降。</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="zh-cn" key="PIM_SMALL_WARNING">您选择了一个小于VeraCrypt默认值的PIM。\n注意如果您的密码强度不够强，这会是一个安全隐患。\n\n您确定您在使用一个强密码？</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="zh-cn" key="PIM_SYSENC_TOO_BIG">对于系统加密，自定迭代倍数 (PIM) 的最大值是65535。</entry>
     <entry lang="zh-cn" key="PIM_TITLE">卷 PIM</entry>
     <entry lang="zh-cn" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\n警告：在密钥文件搜索路径中存在隐藏文件。此类隐藏文件无法被用作密钥文件。如果您需要将它们当作密钥文件使用，请去除它们的“隐藏”属性（使用鼠标右键点击文件，选择“属性”，去除勾选“隐藏”标志再点击“确定”按钮）。注意：隐藏文件仅在启用相关选项后才可见（我的电脑 -&gt; 工具 -&gt; 文件夹选项 -&gt; 查看）。</entry>
@@ -1105,6 +1108,7 @@
     <entry lang="zh-cn" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">当使用TrueCrypt模式时不能使用这个算法。</entry>
     <entry lang="zh-cn" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">当使用TrueCrypt模式时不能使用PIM 。</entry>
     <entry lang="zh-cn" key="PIM_REQUIRE_LONG_PASSWORD">要使用这个PIM数值，您的密码必须大于20个字符。\n如果密码小于20个字符，只能使用485以上的PIM。</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="zh-cn" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">要使用这个PIM数值，您的启动验证密码必须大于20个字符。\n如果密码小于20个字符，只能使用98以上的PIM。</entry>
     <entry lang="zh-cn" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">密钥文件当前不支持用在系统加密中。</entry>
     <entry lang="zh-cn" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">警告：VeraCrypt 不能存储原始键盘布局。这可能导致您无法正确输入密码。</entry>

Translations/Language.zh-hk.xml

@@ -644,10 +644,13 @@
     <entry lang="zh-hk" key="PIM_HIDVOL_TITLE">隱藏加密區 PIM</entry>
     <entry lang="zh-hk" key="PIM_HIDDEN_OS_TITLE">隱藏系統 PIM</entry>
     <entry lang="zh-hk" key="PIM_HELP">PIM (個人迭代倍數, Personal Iterations Multiplier)是一個標頭數據加密鑰衍生演算法用來控制迭代次數數目的數值如下所示：\n      迭代次數 = 15000 + (PIM x 1000)。\n\n當該數值留空或設定為 0 時，VeraCrypt 將會使用預設數值 (485) 以確保高度的安全性。\n\n當密碼的長度短於 20 字元時，PIM 的數值不可少於 485 以保持最低限度的安全性程度。\n當密碼的長度是 20 或更長時， PIM 可以設定為任何數值。\n\n一個大於 485 的 PIM 數值會引致掛載速度緩慢。一個細的 PIM 數值 (少於 485) 將可以令掛載速度較快，但如果同時密碼強度不足的話則會降低安全性。</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="zh-hk" key="PIM_SYSENC_HELP">PIM (個人迭代倍數, Personal Iterations Multiplier)是一個標頭數據加密鑰衍生演算法用來控制迭代次數數目的數值如下所示：\n      迭代次數 = PIM x 2048.\n\n。\n\n當該數值留空或設定為 0 時，VeraCrypt 將會使用預設數值以確保高度的安全性。\n\n當密碼的長度短於 20 字元時，PIM 的數值不可少於 98 以保持最低限度的安全性程度。\n當密碼的長度是 20 或更長時， PIM 可以設定為任何數值。\n\n一個大於 98 的 PIM 數值會引致開機速度緩慢。一個細的 PIM 數值 (少於 98) 將可以令開機速度較快，但如果同時密碼強度不足的話則會降低安全性。</entry>
     <entry lang="zh-hk" key="PIM_SYSENC_CHANGE_WARNING">記住這個用來重新啟動系統的數字</entry>
     <entry lang="zh-hk" key="PIM_LARGE_WARNING">選擇了一個大於 VeraCrypt 預設的 PIM 值。\n請注意這樣會造成掛載/啟動速度變慢。</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="zh-hk" key="PIM_SMALL_WARNING">你已選擇了數值細於預設的個人迭代倍數(Personal Iterations Multiplier, PIM)。請注意如你的密碼強度不足的話，將會引致較弱的安全性。\n\n你是否確認會使用一個強度高的密碼？</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="zh-hk" key="PIM_SYSENC_TOO_BIG">用於系統加密的個人迭代倍數(Personal Iterations Multiplier, PIM) 最大數值為 65535</entry>
     <entry lang="zh-hk" key="PIM_TITLE">加密區 PIM</entry>
     <entry lang="zh-hk" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\n警告：在加密鑰檔案的搜尋路徑中找到一個或多個的隱藏的檔案，這些檔案將不會用作加密鑰檔案。如你想要使用這些檔案作為加密鑰檔案，請移除這些檔案的隱藏屬性 (右按每個檔案然後選擇 [內容]，取消剔選 [隱藏] 然後按 [確定])。請注意：隱藏檔案只會在相關選項啟用時才會被顯示 (本機 &gt; 整理  &gt; [變更資料夾和搜尋選項]  &gt; 檢示)。</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="zh-hk" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">此演算法不支援 TrueCrypt 模式。</entry>
     <entry lang="zh-hk" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">TrueCrypt 模式不支援 PIM (Personal Iterations Multiplier) </entry>
     <entry lang="zh-hk" key="PIM_REQUIRE_LONG_PASSWORD">密碼必須含有 20 或更多的字元長度以使用所指定的 PIM。\nPIM 需要是 485 或更高才可以使用較短的密碼。</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="zh-hk" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">啟動前驗證密碼必須含有 20 個或更多的字元以使用這個 PIM 數值。\n只可以在 PIM 的數值是 98 或更大時才可以使用較短的密碼。</entry>
     <entry lang="zh-hk" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">加密鑰檔案目前並不支援用於系統加密。</entry>
     <entry lang="zh-hk" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">警告：VeraCrypt 不能儲存原始鍵盤配置。這可能導致你無法正確輸入密碼。</entry>

Translations/Language.zh-tw.xml

@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer &gt; Organize &gt; 'Folder and search options' &gt; View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</entry>
     <entry lang="zh-tw" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">&gt;警告：VeraCrypt 不能回復原始鍵盤配置。這可能導致您輸入不正確的密碼。</entry>

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

@@ -79,7 +79,7 @@ The time cost increases by 1 iteration for every 3 increments of PIM when PIM
 <ul>
 <li>For system partition encryption (boot encryption) that uses SHA-256, BLAKE2s-256 or Streebog, <strong>200000</strong> iterations are used which is equivalent to a PIM value of <strong>98</strong>.</li>
 <li>For system encryption that uses SHA-512 or Whirlpool, <strong>500000</strong> iterations are used which is equivalent to a PIM value of <strong>485</strong>.</li>
-<li>For non-system encryption and file containers, all derivation algorithms will use <strong>500000</strong> iterations which is equivalent to a PIM value of <strong>485</strong>.</li>
+<li>For non-system encryption and file containers using PBKDF2-HMAC, <strong>500000</strong> iterations are used which is equivalent to a PIM value of <strong>485</strong>.</li>
 </ul>
 <li><strong>Argon2id defaults:</strong> Memory Cost = 416 MiB, Time Cost = 6 iterations (equivalent to PIM = 12)</li>
 </ul>
@@ -99,16 +99,16 @@ When creating a volume or when changing the password, the user has the possibili
 <div>During the creation of a volume or the encryption of the system, VeraCrypt forces the PIM value to be greater than or equal to a certain minimal value when the password is less than 20 characters. This check is done in order to ensure that, for short passwords,
  the security level is at least equal to the default level provided by an empty PIM.</div>
 <div>&nbsp;</div>
-<div>The PIM minimal value for short passwords is <strong>98</strong> for system encryption that doesn't use SHA-512 or Whirlpool and
-<strong>485</strong> for the other cases. For password with 20 characters and more, the PIM minimal value is
-<strong>1</strong>. In all cases, leaving the PIM empty or setting its value to 0 will make VeraCrypt use the default high number of iterations as explained in section
+<div>The PIM minimal value for short passwords is <strong>12</strong> for Argon2id volumes, <strong>98</strong> for system encryption that doesn't use SHA-512 or Whirlpool, and
+<strong>485</strong> for PBKDF2-HMAC in the other cases. For password with 20 characters and more, the PIM minimal value is
+<strong>1</strong>. In all cases, leaving the PIM empty or setting its value to 0 will make VeraCrypt use the default KDF parameters as explained in section
 <a href="Header%20Key%20Derivation.html">
 Header Key Derivation</a>.</div>
 <div><br>
 Motivations behind using a custom PIM value can be:<br>
 <ul>
 <li>Add an extra secret parameter (PIM) that an attacker will have to guess </li><li>Increase security level by using large PIM values to thwart future development of brute force attacks.
-</li><li>Speeding up booting or mounting through the use of a small PIM value (less than 98 for system encryption that doesn't use SHA-512 or Whirlpool and less than 485 for the other cases)
+</li><li>Speeding up booting or mounting through the use of a small PIM value (less than 12 for Argon2id volumes, less than 98 for system encryption that doesn't use SHA-512 or Whirlpool, and less than 485 for PBKDF2-HMAC in the other cases)
 </li></ul>
 <p>The screenshots below show the step to mount a volume using a PIM equal to 231:</p>
 <table style="margin-left:auto; margin-right:auto">

src/Common/Common.rc

@@ -84,7 +84,7 @@ BEGIN
     COMBOBOX        IDC_PKCS5_PRF_ID,134,154,91,90,CBS_DROPDOWNLIST | WS_TABSTOP
     EDITTEXT        IDC_PIM,134,174,42,14,ES_RIGHT | ES_PASSWORD | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_VISIBLE
     CONTROL         "Use P&IM",IDC_PIM_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,134,179,97,10
-    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,181,177,121,8,NOT WS_VISIBLE
+    LTEXT           "(Empty or 0 for defaults)",IDC_PIM_HELP,181,177,121,8,NOT WS_VISIBLE
     CONTROL         "&Display password",IDC_SHOW_PASSWORD_MO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,134,192,90,10
     CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE_HIDVOL_PROT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,134,205,90,10
     PUSHBUTTON      "&Keyfiles...",IDC_KEYFILES_HIDVOL_PROT,239,201,60,14

src/Common/Crypto.h

@@ -66,6 +66,7 @@ enum
 
 #define BLAKE2S_BLOCKSIZE		64
 #define BLAKE2S_DIGESTSIZE		32
+#define BLAKE2B_DIGESTSIZE		64
 
 #define SHA256_BLOCKSIZE		64
 #define SHA256_DIGESTSIZE		32

src/Common/Language.xml

@@ -152,8 +152,8 @@
     <entry lang="en" key="IDC_MOUNT_OPTIONS">Mount Opti&amp;ons...</entry>
     <entry lang="en" key="IDC_MOUNT_READONLY">Mount volume as read-&amp;only</entry>
     <entry lang="en" key="IDC_NEW_KEYFILES">Keyfiles...</entry>
-    <entry lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for default iterations)</entry>
-    <entry lang="en" key="IDC_PIM_HELP">(Empty or 0 for default iterations)</entry>
+    <entry lang="en" key="IDC_OLD_PIM_HELP">(Empty or 0 for defaults)</entry>
+    <entry lang="en" key="IDC_PIM_HELP">(Empty or 0 for defaults)</entry>
     <entry lang="en" key="IDC_PREF_BKG_TASK_ENABLE">Enabled</entry>
     <entry lang="en" key="IDC_PREF_CACHE_PASSWORDS">Cache passwords in driver memory</entry>
     <entry lang="en" key="IDC_PREF_UNMOUNT_INACTIVE">Auto-unmount volume after no data has been read/written to it for</entry>
@@ -644,10 +644,13 @@
     <entry lang="en" key="PIM_HIDVOL_TITLE">Hidden Volume PIM</entry>
     <entry lang="en" key="PIM_HIDDEN_OS_TITLE">PIM for Hidden Operating System</entry>
     <entry lang="en" key="PIM_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = 15000 + (PIM x 1000).\n\nWhen left empty or set to 0, VeraCrypt will use a default value (485) that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 485 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 485 will lead to slower mount. A small PIM value (less than 485) will lead to a quicker mount but it can reduce security if the password is not strong enough.</entry>
+    <entry lang="en" key="PIM_ARGON2_HELP">PIM (Personal Iterations Multiplier) controls the memory and time costs used by Argon2id header key derivation as follows:\n      Memory = min(64 MiB + ((PIM - 1) x 32 MiB), 1024 MiB)\n      Iterations = 3 + ((PIM - 1) / 3) for PIM 31 or lower, then 13 + (PIM - 31)\n\nWhen left empty or set to 0, VeraCrypt will use the default Argon2 PIM (12), which uses 416 MiB of memory and 6 iterations.\n\nWhen the password is less than 20 characters, Argon2 PIM can't be smaller than 12 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, Argon2 PIM can be set to any value.\n\nAn Argon2 PIM larger than 12 increases memory usage up to 1024 MiB and then increases iterations. This will lead to slower mounting. A small Argon2 PIM (less than 12) will lead to quicker mounting but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_HELP">PIM (Personal Iterations Multiplier) is a value that controls the number of iterations used by the header key derivation as follows:\n      Iterations = PIM x 2048.\n\nWhen left empty or set to 0, VeraCrypt will use a default value that ensures a high security.\n\nWhen the password is less than 20 characters, PIM can't be smaller than 98 in order to maintain a minimal security level.\nWhen the password is 20 characters or more, PIM can be set to any value.\n\nA PIM value larger than 98 will lead to slower boot. A small PIM value (less than 98) will lead to a quicker boot but it can reduce security if the password is not strong enough.</entry>
     <entry lang="en" key="PIM_SYSENC_CHANGE_WARNING">Remember Number to Boot System</entry>
     <entry lang="en" key="PIM_LARGE_WARNING">You have chosen a PIM value that is larger than VeraCrypt default value.\nPlease note that this will lead to much slower mount/boot.</entry>
+    <entry lang="en" key="PIM_ARGON2_LARGE_WARNING">You have chosen an Argon2 PIM value that is larger than VeraCrypt default value.\nPlease note that this can require more memory and lead to much slower mounting.</entry>
     <entry lang="en" key="PIM_SMALL_WARNING">You have chosen a Personal Iterations Multiplier (PIM) that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to a weaker security.\n\nDo you confirm that you are using a strong password?</entry>
+    <entry lang="en" key="PIM_ARGON2_SMALL_WARNING">You have chosen an Argon2 PIM value that is smaller than the default VeraCrypt value. Please note that if your password is not strong enough, this could lead to weaker security.\n\nDo you confirm that you are using a strong password?</entry>
     <entry lang="en" key="PIM_SYSENC_TOO_BIG">Personal Iterations Multiplier (PIM) maximum value for system encryption is 65535.</entry>
     <entry lang="en" key="PIM_TITLE">Volume PIM</entry>
     <entry lang="en" key="HIDDEN_FILES_PRESENT_IN_KEYFILE_PATH">\n\nWARNING: Hidden file(s) have been found in a keyfile search path. Such hidden files cannot be used as keyfiles. If you need to use them as keyfiles, remove their 'Hidden' attribute (right-click each of them, select 'Properties', uncheck 'Hidden' and click OK). Note: Hidden files are visible only if the corresponding option is enabled (Computer > Organize > 'Folder and search options' > View).</entry>
@@ -1104,6 +1107,7 @@
     <entry lang="en" key="ALGO_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">This algorithm is not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_NOT_SUPPORTED_FOR_TRUECRYPT_MODE">PIM (Personal Iterations Multiplier) not supported for TrueCrypt mode.</entry>
     <entry lang="en" key="PIM_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 485 or greater.</entry>
+    <entry lang="en" key="PIM_ARGON2_REQUIRE_LONG_PASSWORD">Password must contain 20 or more characters in order to use the specified Argon2 PIM.\nShorter passwords can only be used if the Argon2 PIM is 12 or greater.</entry>
     <entry lang="en" key="BOOT_PIM_REQUIRE_LONG_PASSWORD">Pre-boot authentication Password must contain 20 or more characters in order to use the specified PIM.\nShorter passwords can only be used if the PIM is 98 or greater.</entry>
     <entry lang="en" key="KEYFILES_NOT_SUPPORTED_FOR_SYS_ENCRYPTION">Keyfiles are currently not supported for system encryption.</entry>
     <entry lang="en" key="CANNOT_RESTORE_KEYBOARD_LAYOUT">Warning: VeraCrypt could not restore the original keyboard layout. This may cause you to enter a password incorrectly.</entry>

src/Common/Password.c

@@ -136,13 +136,32 @@ BOOL CheckPasswordCharEncoding (HWND hPassword, Password *ptrPw)
 
 BOOL CheckPasswordLength (HWND hwndDlg, unsigned __int32 passwordLength, int pim, BOOL bForBoot, int bootPRF, BOOL bSkipPasswordWarning, BOOL bSkipPimWarning)
 {
-	BOOL bootPimCondition = (bForBoot && (bootPRF != SHA512 && bootPRF != WHIRLPOOL))? TRUE : FALSE;
-	BOOL bCustomPimSmall = ((pim != 0) && (pim < (bootPimCondition? 98 : bootPRF == ARGON2? 12 : 485)))? TRUE : FALSE;
+	BOOL bootPimCondition = FALSE;
+	BOOL argon2PimCondition = FALSE;
+	int defaultPim;
+	BOOL bCustomPimSmall;
+	const char *pimRequireLongPasswordMessage = "PIM_REQUIRE_LONG_PASSWORD";
+	const char *pimLargeWarningMessage = "PIM_LARGE_WARNING";
+	const char *pimSmallWarningMessage = "PIM_SMALL_WARNING";
+#ifndef VC_DCS_DISABLE_ARGON2
+	argon2PimCondition = (bootPRF == ARGON2)? TRUE : FALSE;
+#endif
+	bootPimCondition = (!argon2PimCondition && bForBoot && (bootPRF != SHA512 && bootPRF != WHIRLPOOL))? TRUE : FALSE;
+	defaultPim = bootPimCondition? 98 : argon2PimCondition? 12 : 485;
+	bCustomPimSmall = ((pim != 0) && (pim < defaultPim))? TRUE : FALSE;
+	if (bootPimCondition)
+		pimRequireLongPasswordMessage = "BOOT_PIM_REQUIRE_LONG_PASSWORD";
+	else if (argon2PimCondition)
+	{
+		pimRequireLongPasswordMessage = "PIM_ARGON2_REQUIRE_LONG_PASSWORD";
+		pimLargeWarningMessage = "PIM_ARGON2_LARGE_WARNING";
+		pimSmallWarningMessage = "PIM_ARGON2_SMALL_WARNING";
+	}
 	if (passwordLength < PASSWORD_LEN_WARNING)
 	{
 		if (bCustomPimSmall)
 		{
-			Error (bootPimCondition? "BOOT_PIM_REQUIRE_LONG_PASSWORD": "PIM_REQUIRE_LONG_PASSWORD", hwndDlg);
+			Error (pimRequireLongPasswordMessage, hwndDlg);
 			return FALSE;
 		}
 
@@ -154,15 +173,15 @@ BOOL CheckPasswordLength (HWND hwndDlg, unsigned __int32 passwordLength, int pim
 #ifndef _DEBUG
 	else if (bCustomPimSmall)
 	{
-		if (!bSkipPimWarning && AskWarnNoYes ("PIM_SMALL_WARNING", hwndDlg) != IDYES)
+		if (!bSkipPimWarning && AskWarnNoYes (pimSmallWarningMessage, hwndDlg) != IDYES)
 			return FALSE;
 	}
 #endif
 
-	if ((pim != 0) && (pim > (bootPimCondition? 98 : bootPRF == ARGON2? 12 : 485)))
+	if ((pim != 0) && (pim > defaultPim))
 	{
 		// warn that mount/boot will take more time
-		Warning ("PIM_LARGE_WARNING", hwndDlg);
+		Warning (pimLargeWarningMessage, hwndDlg);
 
 	}
 	return TRUE;
@@ -404,6 +423,12 @@ int ChangePwd (const wchar_t *lpszVolume, Password *oldPassword, int old_pkcs5,
 	if (pkcs5 != 0)
 		cryptoInfo->pkcs5 = pkcs5;
 
+	if (pkcs5 == 0 && old_pkcs5 == 0 && !CheckPasswordLength (hwndDlg, newPassword->Length, pim, FALSE, cryptoInfo->pkcs5, TRUE, FALSE))
+	{
+		nStatus = ERR_USER_ABORT;
+		goto error;
+	}
+
 	RandSetHashFunction (cryptoInfo->pkcs5);
 
 	NormalCursor();
@@ -567,4 +592,3 @@ error:
 
 	return nStatus;
 }
-

src/Common/Pkcs5.c

@@ -1337,15 +1337,16 @@ int is_pkcs5_prf_supported (int pkcs5_prf_id, PRF_BOOT_TYPE bootType)
 }
 
 #ifndef VC_DCS_DISABLE_ARGON2
-void derive_key_argon2(const unsigned char *pwd, int pwd_len, const unsigned char *salt, int salt_len, uint32 iterations, uint32 memcost, unsigned char *dk, int dklen, volatile long *pAbortKeyDerivation)
+int derive_key_argon2(const unsigned char *pwd, int pwd_len, const unsigned char *salt, int salt_len, uint32 iterations, uint32 memcost, unsigned char *dk, int dklen, volatile long *pAbortKeyDerivation)
 {
+	int result;
 #if defined (DEVICE_DRIVER) && !defined(_M_ARM64)
 	NTSTATUS saveStatus = STATUS_INVALID_PARAMETER;
 	XSTATE_SAVE SaveState;
 	if (HasSAVX2())
 		saveStatus = KeSaveExtendedProcessorState(XSTATE_MASK_GSSE, &SaveState);
 #endif
-	if (0 != argon2id_hash_raw(
+	result = argon2id_hash_raw(
 		iterations, // number of iterations
 		memcost, // memory cost in KiB
 		1, // parallelism factor (number of threads)
@@ -1353,15 +1354,17 @@ void derive_key_argon2(const unsigned char *pwd, int pwd_len, const unsigned cha
 		salt, salt_len, // salt and its length
 		dk, dklen,// derived key and its length
 		pAbortKeyDerivation 
-	))
+	);
+	if (0 != result)
 	{
-		// If the Argon2 derivation fails, we fill the derived key with zeroes
+		// If the Argon2 derivation fails, ensure unchecked legacy callers cannot use stale data.
 		memset(dk, 0, dklen);
 	}
 #if defined (DEVICE_DRIVER) && !defined(_M_ARM64)
 	if (NT_SUCCESS(saveStatus))
 		KeRestoreExtendedProcessorState(&SaveState);
 #endif
+	return result;
 }
 
 /**

src/Common/Pkcs5.h

@@ -45,7 +45,7 @@ int get_pkcs5_iteration_count (int pkcs5_prf_id, int pim, BOOL bBoot, int* pMemo
 wchar_t *get_kdf_name (int kdf_id);
 
 #ifndef VC_DCS_DISABLE_ARGON2
-void derive_key_argon2(const unsigned char *pwd, int pwd_len, const unsigned char *salt, int salt_len, uint32 iterations, uint32 memcost, unsigned char *dk, int dklen, long volatile *pAbortKeyDerivation);
+int derive_key_argon2(const unsigned char *pwd, int pwd_len, const unsigned char *salt, int salt_len, uint32 iterations, uint32 memcost, unsigned char *dk, int dklen, long volatile *pAbortKeyDerivation);
 void get_argon2_params(int pim, int* pIterations, int* pMemcost);
 #endif
 

src/Common/Random.c

@@ -277,11 +277,14 @@ BOOL Randmix ()
 			digestSize = SHA256_DIGESTSIZE;
 			break;
 
-        #ifndef WOLFCRYPT_BACKEND	
-               case BLAKE2S:
-               case ARGON2: // in case of Argon2, we use Blake2s
-			digestSize = BLAKE2S_DIGESTSIZE;
-			break;
+        #ifndef WOLFCRYPT_BACKEND
+			case BLAKE2S:
+				digestSize = BLAKE2S_DIGESTSIZE;
+				break;
+
+			case ARGON2:
+				digestSize = BLAKE2B_DIGESTSIZE;
+				break;
 	
 		case WHIRLPOOL:
 			digestSize = WHIRLPOOL_DIGESTSIZE;
@@ -366,10 +369,13 @@ BOOL Randmix ()
 			break;
 
         #ifndef WOLFCRYPT_BACKEND
-               case BLAKE2S:
-               case ARGON2: // in case of Argon2, we use Blake2s
-			burn (&bctx, sizeof(bctx));
-			break;
+			case BLAKE2S:
+				burn (&bctx, sizeof(bctx));
+				break;
+
+			case ARGON2:
+				burn (&b2ctx, sizeof(b2ctx));
+				break;
 
 		case WHIRLPOOL:
 			burn (&wctx, sizeof(wctx));
@@ -974,4 +980,3 @@ BOOL FastPoll (void)
 
 	return TRUE;
 }
-

src/Common/Random.h

@@ -21,7 +21,8 @@ extern "C" {
 /* RNG defines & pool pointers */
 #define RNG_POOL_SIZE	320	// Must be divisible by the size of the output of each of the implemented hash functions. (in bytes)
 
-#if RNG_POOL_SIZE % SHA512_DIGESTSIZE || RNG_POOL_SIZE % WHIRLPOOL_DIGESTSIZE || RNG_POOL_SIZE % BLAKE2S_DIGESTSIZE
+#if RNG_POOL_SIZE % SHA512_DIGESTSIZE || RNG_POOL_SIZE % WHIRLPOOL_DIGESTSIZE || RNG_POOL_SIZE % BLAKE2S_DIGESTSIZE \
+	|| (!defined(VC_DCS_DISABLE_ARGON2) && RNG_POOL_SIZE % BLAKE2B_DIGESTSIZE)
 #error RNG_POOL_SIZE must be divisible by the size of the output of each of the implemented hash functions.
 #endif
 

src/Core/Core.h

@@ -76,6 +76,7 @@ namespace VeraCrypt
 		int m_pim;
 		shared_ptr <Pkcs5Kdf> m_kdf;
 		shared_ptr <KeyfileList> m_keyfiles;
+		shared_ptr <Volume> m_openVolume;
 		shared_ptr <VolumePassword> m_newPassword;
 		int m_newPim;
 		shared_ptr <KeyfileList> m_newKeyfiles;
@@ -83,10 +84,15 @@ namespace VeraCrypt
 		int m_wipeCount;
 		bool m_emvSupportEnabled;
 		bool m_masterKeyVulnerable;
-		ChangePasswordThreadRoutine(shared_ptr <VolumePath> volumePath, bool preserveTimestamps, shared_ptr <VolumePassword> password, int pim, shared_ptr <Pkcs5Kdf> kdf, shared_ptr <KeyfileList> keyfiles, shared_ptr <VolumePassword> newPassword, int newPim, shared_ptr <KeyfileList> newKeyfiles, shared_ptr <Pkcs5Kdf> newPkcs5Kdf, int wipeCount, bool emvSupportEnabled) : m_volumePath(volumePath), m_preserveTimestamps(preserveTimestamps), m_password(password), m_pim(pim), m_kdf(kdf), m_keyfiles(keyfiles), m_newPassword(newPassword), m_newPim(newPim), m_newKeyfiles(newKeyfiles), m_newPkcs5Kdf(newPkcs5Kdf), m_wipeCount(wipeCount), m_emvSupportEnabled(emvSupportEnabled), m_masterKeyVulnerable(false)  {}
+		ChangePasswordThreadRoutine(shared_ptr <VolumePath> volumePath, bool preserveTimestamps, shared_ptr <VolumePassword> password, int pim, shared_ptr <Pkcs5Kdf> kdf, shared_ptr <KeyfileList> keyfiles, shared_ptr <VolumePassword> newPassword, int newPim, shared_ptr <KeyfileList> newKeyfiles, shared_ptr <Pkcs5Kdf> newPkcs5Kdf, int wipeCount, bool emvSupportEnabled) : m_volumePath(volumePath), m_preserveTimestamps(preserveTimestamps), m_password(password), m_pim(pim), m_kdf(kdf), m_keyfiles(keyfiles), m_openVolume(), m_newPassword(newPassword), m_newPim(newPim), m_newKeyfiles(newKeyfiles), m_newPkcs5Kdf(newPkcs5Kdf), m_wipeCount(wipeCount), m_emvSupportEnabled(emvSupportEnabled), m_masterKeyVulnerable(false)  {}
+		ChangePasswordThreadRoutine(shared_ptr <Volume> openVolume, shared_ptr <VolumePassword> newPassword, int newPim, shared_ptr <KeyfileList> newKeyfiles, shared_ptr <Pkcs5Kdf> newPkcs5Kdf, int wipeCount, bool emvSupportEnabled) : m_volumePath(), m_preserveTimestamps(false), m_password(), m_pim(0), m_kdf(), m_keyfiles(), m_openVolume(openVolume), m_newPassword(newPassword), m_newPim(newPim), m_newKeyfiles(newKeyfiles), m_newPkcs5Kdf(newPkcs5Kdf), m_wipeCount(wipeCount), m_emvSupportEnabled(emvSupportEnabled), m_masterKeyVulnerable(false)  {}
 		virtual ~ChangePasswordThreadRoutine() { }
 		virtual void ExecutionCode(void) { 
-			shared_ptr <Volume> openVolume = Core->ChangePassword(m_volumePath, m_preserveTimestamps, m_password, m_pim, m_kdf, m_keyfiles, m_newPassword, m_newPim, m_newKeyfiles, m_emvSupportEnabled, m_newPkcs5Kdf, m_wipeCount); 
+			shared_ptr <Volume> openVolume = m_openVolume;
+			if (openVolume)
+				Core->ChangePassword(openVolume, m_newPassword, m_newPim, m_newKeyfiles, m_emvSupportEnabled, m_newPkcs5Kdf, m_wipeCount);
+			else
+				openVolume = Core->ChangePassword(m_volumePath, m_preserveTimestamps, m_password, m_pim, m_kdf, m_keyfiles, m_newPassword, m_newPim, m_newKeyfiles, m_emvSupportEnabled, m_newPkcs5Kdf, m_wipeCount);
 			m_masterKeyVulnerable = openVolume->IsMasterKeyVulnerable();
 		}
 	};

src/Core/CoreBase.cpp

@@ -67,7 +67,9 @@ namespace VeraCrypt
 				else
 					RandomNumberGenerator::GetDataFast (newSalt);
 
-				newPkcs5Kdf->DeriveKey (newHeaderKey, *password, newPim, newSalt);
+				int derivationResult = newPkcs5Kdf->DeriveKey (newHeaderKey, *password, newPim, newSalt);
+				if (derivationResult != 0)
+					throw ExternalException (SRC_POS, newPkcs5Kdf->GetDerivationFailureMessage (derivationResult));
 
 				openVolume->ReEncryptHeader (backupHeader, newSalt, newHeaderKey, newPkcs5Kdf);
 				openVolume->GetFile()->Flush();
@@ -289,7 +291,9 @@ namespace VeraCrypt
 		shared_ptr <VolumePassword> passwordKey (Keyfile::ApplyListToPassword (keyfiles, password, emvSupportEnabled));
 
 		RandomNumberGenerator::GetData (newSalt);
-		pkcs5Kdf->DeriveKey (newHeaderKey, *passwordKey, pim, newSalt);
+		int derivationResult = pkcs5Kdf->DeriveKey (newHeaderKey, *passwordKey, pim, newSalt);
+		if (derivationResult != 0)
+			throw ExternalException (SRC_POS, pkcs5Kdf->GetDerivationFailureMessage (derivationResult));
 
 		header->EncryptNew (newHeaderBuffer, newSalt, newHeaderKey, pkcs5Kdf);
 	}

src/Core/VolumeCreator.cpp

@@ -143,7 +143,9 @@ namespace VeraCrypt
 				SecureBuffer backupHeaderSalt (VolumeHeader::GetSaltSize());
 				RandomNumberGenerator::GetData (backupHeaderSalt);
 
-				Options->VolumeHeaderKdf->DeriveKey (HeaderKey, *PasswordKey, Options->Pim, backupHeaderSalt);
+				int derivationResult = Options->VolumeHeaderKdf->DeriveKey (HeaderKey, *PasswordKey, Options->Pim, backupHeaderSalt);
+				if (derivationResult != 0)
+					throw ExternalException (SRC_POS, Options->VolumeHeaderKdf->GetDerivationFailureMessage (derivationResult));
 
 				Layout->GetHeader()->EncryptNew (backupHeader, backupHeaderSalt, HeaderKey, Options->VolumeHeaderKdf);
 
@@ -316,7 +318,9 @@ namespace VeraCrypt
 			// Header key
 			HeaderKey.Allocate (VolumeHeader::GetLargestSerializedKeySize());
 			PasswordKey = Keyfile::ApplyListToPassword (options->Keyfiles, options->Password, options->EMVSupportEnabled);
-			options->VolumeHeaderKdf->DeriveKey (HeaderKey, *PasswordKey, options->Pim, salt);
+			int derivationResult = options->VolumeHeaderKdf->DeriveKey (HeaderKey, *PasswordKey, options->Pim, salt);
+			if (derivationResult != 0)
+				throw ExternalException (SRC_POS, options->VolumeHeaderKdf->GetDerivationFailureMessage (derivationResult));
 			headerOptions.HeaderKey = HeaderKey;
 
 			header->Create (headerBuffer, headerOptions);

src/ExpandVolume/ExpandVolume.rc

@@ -97,7 +97,7 @@ BEGIN
     RTEXT           "Password:",IDT_PASSWORD,0,10,65,13
     RTEXT           "KDF:",IDT_KDF,0,27,65,13
     RTEXT           "Volume PIM:",IDT_PIM,0,46,65,13,NOT WS_VISIBLE
-    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,115,46,189,8,NOT WS_VISIBLE
+    LTEXT           "(Empty or 0 for defaults)",IDC_PIM_HELP,115,46,189,8,NOT WS_VISIBLE
 END
 
 IDD_EXPAND_PROGRESS_DLG DIALOGEX 0, 0, 376, 283

src/Format/Format.rc

@@ -230,7 +230,7 @@ BEGIN
     EDITTEXT        IDC_PASSWORD_DIRECT,75,2,198,14,ES_PASSWORD | ES_AUTOHSCROLL
     COMBOBOX        IDC_PKCS5_PRF_ID,75,17,131,90,CBS_DROPDOWNLIST | WS_TABSTOP
     EDITTEXT        IDC_PIM,75,32,42,14,ES_RIGHT | ES_PASSWORD | ES_AUTOHSCROLL | ES_NUMBER | NOT WS_VISIBLE
-    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,121,34,152,8,NOT WS_VISIBLE
+    LTEXT           "(Empty or 0 for defaults)",IDC_PIM_HELP,121,34,152,8,NOT WS_VISIBLE
     CONTROL         "&Display password",IDC_SHOW_PASSWORD_SINGLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,46,109,11,WS_EX_TRANSPARENT
     CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,75,57,106,11
     PUSHBUTTON      "&Keyfiles...",IDC_KEY_FILES,188,54,85,14
@@ -449,7 +449,7 @@ BEGIN
     CONTROL         "Display PIM",IDC_SHOW_PIM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,74,17,196,10
     LTEXT           "",IDC_BOX_HELP,0,32,273,142
     RTEXT           "Volume PIM:",IDT_PIM,1,3,69,8
-    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,120,3,153,8
+    LTEXT           "(Empty or 0 for defaults)",IDC_PIM_HELP,120,3,153,8
     LTEXT           "Information on PIM",IDC_LINK_PIM_INFO,0,179,273,8,SS_NOTIFY
 END
 

src/Format/Tcformat.c

@@ -792,6 +792,22 @@ static BOOL CreatingHiddenSysVol (void)
 		&& bHiddenVol && !bHiddenVolHost);
 }
 
+static const char *GetPimHelpStringId (int pkcs5Prf, BOOL systemEncryption)
+{
+#if !defined (WOLFCRYPT_BACKEND) && !defined (VC_DCS_DISABLE_ARGON2)
+	if (pkcs5Prf == ARGON2)
+		return "PIM_ARGON2_HELP";
+#endif
+#ifndef WOLFCRYPT_BACKEND
+	if (systemEncryption && pkcs5Prf != SHA512 && pkcs5Prf != WHIRLPOOL)
+		return "PIM_SYSENC_HELP";
+#else
+	if (systemEncryption && pkcs5Prf != SHA512)
+		return "PIM_SYSENC_HELP";
+#endif
+	return "PIM_HELP";
+}
+
 static void LoadSettingsAndCheckModified (HWND hwndDlg, BOOL bOnlyCheckModified, BOOL* pbSettingsModified, BOOL* pbHistoryModified)
 {
 	if (!bOnlyCheckModified)
@@ -4500,11 +4516,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 				}
 
 				SetFocus (GetDlgItem (hwndDlg, IDC_PIM));
-                            #ifndef WOLFCRYPT_BACKEND
-				SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), GetString (SysEncInEffect () && hash_algo != SHA512 && hash_algo != WHIRLPOOL? "PIM_SYSENC_HELP" : "PIM_HELP"));
-                            #else
-				SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), GetString (SysEncInEffect () && hash_algo != SHA512? "PIM_SYSENC_HELP" : "PIM_HELP"));
-                            #endif
+				SetWindowTextW (GetDlgItem (hwndDlg, IDC_BOX_HELP), GetString (GetPimHelpStringId (hash_algo, SysEncInEffect ())));
 				ToHyperlink (hwndDlg, IDC_LINK_PIM_INFO);
 
 				if (CreatingHiddenSysVol())

src/FormatDLL/VeraCryptFormatSDK.cpp

@@ -205,7 +205,7 @@ static int CreateVolumeInternal(const VeraCryptFormatOptions* options)
 
 	if (options->password)
 	{
-		if (!CheckPasswordLength(NULL, (int)strlen(options->password), options->pim, FALSE, 0, TRUE, TRUE))
+		if (!CheckPasswordLength(NULL, (int)strlen(options->password), options->pim, FALSE, hash_algo, TRUE, TRUE))
 		{
 			return VCF_ERROR_PASSWORD_POLICY;
 		}

src/FormatDLL/VeraCryptFormatSDK.h

@@ -66,7 +66,7 @@ typedef struct _VeraCryptFormatOptions
 	/** The encryption algorithm to use. E.g., L"AES", L"Serpent", L"Twofish", L"AES-Twofish-Serpent". */
 	const wchar_t* encryptionAlgorithm;
 
-	/** The header key derivation and random pool hash algorithm. E.g., L"SHA-512", L"RIPEMD-160", L"Whirlpool", L"BLAKE2s-256", L"SHA-256". */
+	/** The header key derivation algorithm and random pool hash selector. E.g., L"Argon2" (Argon2id KDF), L"SHA-512", L"RIPEMD-160", L"Whirlpool", L"BLAKE2s-256", L"SHA-256". */
 	const wchar_t* hashAlgorithm;
 
 	/** The filesystem for the new volume. E.g., L"NTFS", L"FAT", L"ExFAT", L"ReFS", or L"None". */

src/Main/CommandLineInterface.cpp

@@ -18,9 +18,30 @@
 #include "CommandLineInterface.h"
 #include "LanguageStrings.h"
 #include "UserInterfaceException.h"
+#include "Volume/Pkcs5Kdf.h"
 
 namespace VeraCrypt
 {
+	static shared_ptr <Pkcs5Kdf> FindKdfAlgorithm (const wxString &name)
+	{
+		foreach (shared_ptr <Pkcs5Kdf> kdf, Pkcs5Kdf::GetAvailableAlgorithms())
+		{
+			wxString kdfName (kdf->GetName());
+			shared_ptr <Hash> hash = kdf->GetHash();
+			wxString hashName (hash->GetName());
+			wxString hashAltName (hash->GetAltName());
+			if (kdfName.IsSameAs (name, false)
+				|| (kdf->IsArgon2() && name.IsSameAs (L"Argon2id", false)))
+				return kdf;
+
+			if (!kdf->IsArgon2()
+				&& (hashName.IsSameAs (name, false) || hashAltName.IsSameAs (name, false)))
+				return kdf;
+		}
+
+		return shared_ptr <Pkcs5Kdf> ();
+	}
+
 	CommandLineInterface::CommandLineInterface (int argc, wchar_t** argv, UserInterfaceType::Enum interfaceType) :
 		ArgCommand (CommandId::None),
 		ArgFilesystem (VolumeCreationOptions::FilesystemType::Unknown),
@@ -67,7 +88,7 @@ namespace VeraCrypt
 #if !defined(TC_WINDOWS) && !defined(TC_MACOSX)
 		parser.AddOption (L"",	L"fs-options",			_("Filesystem mount options"));
 #endif
-		parser.AddOption (L"",	L"hash",				_("Hash algorithm"));
+		parser.AddOption (L"",	L"hash",				_("Header key derivation algorithm"));
 		parser.AddSwitch (L"h", L"help",				_("Display detailed command line help"), wxCMD_LINE_OPTION_HELP);
 		parser.AddSwitch (L"",	L"import-token-keyfiles", _("Import keyfiles to security token"));
 		parser.AddOption (L"k", L"keyfiles",			_("Keyfiles"));
@@ -78,7 +99,7 @@ namespace VeraCrypt
 		parser.AddSwitch (L"",	L"load-preferences",	_("Load user preferences"));
 		parser.AddSwitch (L"",	L"mount",				_("Mount volume interactively"));
 		parser.AddOption (L"m", L"mount-options",		_("VeraCrypt volume mount options"));
-		parser.AddOption (L"",	L"new-hash",			_("New hash algorithm"));
+		parser.AddOption (L"",	L"new-hash",			_("New header key derivation algorithm"));
 		parser.AddOption (L"",	L"new-keyfiles",		_("New keyfiles"));
 		parser.AddOption (L"",	L"new-password",		_("New password"));
 		parser.AddOption (L"",	L"new-pim",				_("New PIM"));
@@ -87,7 +108,7 @@ namespace VeraCrypt
 		parser.AddOption (L"p", L"password",			_("Password"));
 		parser.AddOption (L"",  L"pim",					_("PIM"));
 		parser.AddOption (L"",	L"protect-hidden",		_("Protect hidden volume"));
-		parser.AddOption (L"",	L"protection-hash",		_("Hash algorithm for protected hidden volume"));
+		parser.AddOption (L"",	L"protection-hash",		_("Header key derivation algorithm for protected hidden volume"));
 		parser.AddOption (L"",	L"protection-keyfiles",	_("Keyfiles for protected hidden volume"));
 		parser.AddOption (L"",	L"protection-password",	_("Password for protected hidden volume"));
 		parser.AddOption (L"",	L"protection-pim",		_("PIM for protected hidden volume"));
@@ -396,15 +417,7 @@ namespace VeraCrypt
 
 		if (parser.Found (L"hash", &str))
 		{
-			ArgHash.reset();
-
-			foreach (shared_ptr <Hash> hash, Hash::GetAvailableAlgorithms())
-			{
-				wxString hashName (hash->GetName());
-				wxString hashAltName (hash->GetAltName());
-				if (hashName.IsSameAs (str, false) || hashAltName.IsSameAs (str, false))
-					ArgHash = hash;
-			}
+			ArgHash = FindKdfAlgorithm (str);
 
 			if (!ArgHash)
 				throw_err (LangString["UNKNOWN_OPTION"] + L": " + str);
@@ -412,15 +425,7 @@ namespace VeraCrypt
 
 		if (parser.Found (L"new-hash", &str))
 		{
-			ArgNewHash.reset();
-
-			foreach (shared_ptr <Hash> hash, Hash::GetAvailableAlgorithms())
-			{
-				wxString hashName (hash->GetName());
-				wxString hashAltName (hash->GetAltName());
-				if (hashName.IsSameAs (str, false) || hashAltName.IsSameAs (str, false))
-					ArgNewHash = hash;
-			}
+			ArgNewHash = FindKdfAlgorithm (str);
 
 			if (!ArgNewHash)
 				throw_err (LangString["UNKNOWN_OPTION"] + L": " + str);
@@ -558,19 +563,11 @@ namespace VeraCrypt
 
 		if (parser.Found (L"protection-hash", &str))
 		{
-			bool bHashFound = false;
-			foreach (shared_ptr <Hash> hash, Hash::GetAvailableAlgorithms())
-			{
-				wxString hashName (hash->GetName());
-				wxString hashAltName (hash->GetAltName());
-				if (hashName.IsSameAs (str, false) || hashAltName.IsSameAs (str, false))
-				{
-					bHashFound = true;
-					ArgMountOptions.ProtectionKdf = Pkcs5Kdf::GetAlgorithm (*hash);
-				}
-			}
+			shared_ptr <Pkcs5Kdf> kdf = FindKdfAlgorithm (str);
+			if (kdf)
+				ArgMountOptions.ProtectionKdf = kdf;
 
-			if (!bHashFound)
+			if (!kdf)
 				throw_err (LangString["UNKNOWN_OPTION"] + L": " + str);
 		}
 

src/Main/CommandLineInterface.h

@@ -20,6 +20,7 @@
 #include "Core/VolumeCreator.h"
 #include "UserPreferences.h"
 #include "UserInterfaceType.h"
+#include "Volume/Pkcs5Kdf.h"
 
 namespace VeraCrypt
 {
@@ -66,11 +67,11 @@ namespace VeraCrypt
 		shared_ptr <FilePath> ArgFilePath;
 		VolumeCreationOptions::FilesystemType::Enum ArgFilesystem;
 		bool ArgForce;
-		shared_ptr <Hash> ArgHash;
+		shared_ptr <Pkcs5Kdf> ArgHash;
 		shared_ptr <KeyfileList> ArgKeyfiles;
 		MountOptions ArgMountOptions;
 		shared_ptr <DirectoryPath> ArgMountPoint;
-		shared_ptr <Hash> ArgNewHash;
+		shared_ptr <Pkcs5Kdf> ArgNewHash;
 		shared_ptr <KeyfileList> ArgNewKeyfiles;
 		shared_ptr <VolumePassword> ArgNewPassword;
 		int ArgNewPim;

src/Main/Forms/BenchmarkDialog.cpp

@@ -299,7 +299,9 @@ namespace VeraCrypt
 						
 						for (int i = 1; i <= 2; i++) 
 						{
-							prf->DeriveKey (dk, password, pim, salt);
+							int derivationResult = prf->DeriveKey (dk, password, pim, salt);
+							if (derivationResult != 0)
+								throw ExternalException (SRC_POS, prf->GetDerivationFailureMessage (derivationResult));
 						}
 						
 						time = (uint64) (wxGetLocalTimeMillis().GetValue() - startTime.GetValue());

src/Main/Forms/ChangePasswordDialog.cpp

@@ -18,6 +18,65 @@
 
 namespace VeraCrypt
 {
+	static bool CheckCustomPimForPassword (VolumePasswordPanel *pimPanel, const shared_ptr <VolumePassword> &password, int pim, const shared_ptr <Pkcs5Kdf> &kdf)
+	{
+		int defaultPim = kdf ? kdf->GetDefaultPim() : 0;
+		if (!password || password->Size() == 0 || pim <= 0 || defaultPim <= 0 || pim >= defaultPim)
+			return true;
+
+		if (password->Size() < VolumePassword::SmallPimPasswordSizeThreshold)
+		{
+			Gui->ShowError (kdf ? kdf->GetPimRequireLongPasswordMessageId() : "PIM_REQUIRE_LONG_PASSWORD");
+			pimPanel->SetFocusToPimTextCtrl();
+			return false;
+		}
+
+		if (!Gui->AskYesNo (LangString [kdf ? kdf->GetPimSmallWarningMessageId() : "PIM_SMALL_WARNING"], false, true))
+		{
+			pimPanel->SetFocusToPimTextCtrl();
+			return false;
+		}
+
+		return true;
+	}
+
+	static bool CheckCustomPimForKdfOnlyChange (VolumePasswordPanel *pimPanel, const shared_ptr <VolumePassword> &password, const shared_ptr <Pkcs5Kdf> &kdf, int currentPim)
+	{
+		int defaultPim = kdf ? kdf->GetDefaultPim() : 0;
+		if (!kdf || !password || password->Size() == 0 || currentPim <= 0 || defaultPim <= 0 || currentPim == defaultPim)
+			return true;
+
+		if (currentPim < defaultPim)
+			return CheckCustomPimForPassword (pimPanel, password, currentPim, kdf);
+
+		Gui->ShowWarning (kdf->GetPimLargeWarningMessageId());
+		return true;
+	}
+
+	static bool CheckPasswordChangeWarnings (VolumePasswordPanel *passwordPanel, const shared_ptr <VolumePassword> &password, int pim, const shared_ptr <Pkcs5Kdf> &kdf)
+	{
+		if (!password || password->Size() == 0)
+			return true;
+
+		if (password->Size() < VolumePassword::WarningSizeThreshold)
+		{
+			if (!CheckCustomPimForPassword (passwordPanel, password, pim, kdf))
+				return false;
+
+			if (!Gui->AskYesNo (LangString ["PASSWORD_LENGTH_WARNING"], false, true))
+			{
+				passwordPanel->SetFocusToPasswordTextCtrl();
+				return false;
+			}
+		}
+		else if (!CheckCustomPimForPassword (passwordPanel, password, pim, kdf))
+		{
+			return false;
+		}
+
+		return true;
+	}
+
 #ifdef TC_MACOSX
 
 	bool ChangePasswordDialog::ProcessEvent(wxEvent& event)
@@ -102,11 +161,17 @@ namespace VeraCrypt
 		{
 			shared_ptr <Pkcs5Kdf> currentKdf = CurrentPasswordPanel->GetPkcs5Kdf();
 			int currentPim = CurrentPasswordPanel->GetVolumePim();
+			shared_ptr <Pkcs5Kdf> newKdf = NewPasswordPanel->GetPkcs5Kdf();
 			if (-1 == currentPim)
 			{
 				CurrentPasswordPanel->SetFocusToPimTextCtrl();
 				return;
 			}
+			shared_ptr <VolumePassword> currentPassword = CurrentPasswordPanel->GetPassword();
+			shared_ptr <KeyfileList> currentKeyfiles = CurrentPasswordPanel->GetKeyfiles();
+			bool preserveTimestamps = Gui->GetPreferences().DefaultMountOptions.PreserveTimestamps;
+			bool emvSupportEnabled = Gui->GetPreferences().EMVSupportEnabled;
+			int headerWipeCount = NewPasswordPanel->GetHeaderWipeCount();
 
 			shared_ptr <VolumePassword> newPassword;
 			int newPim = 0;
@@ -128,50 +193,47 @@ namespace VeraCrypt
 					NewPasswordPanel->SetFocusToPimTextCtrl();
 					return;
 				}
-
-				if (newPassword->Size() > 0)
-				{
-					if (newPassword->Size() < VolumePassword::WarningSizeThreshold)
-					{
-						if (newPim > 0 && newPim < 485)
-						{
-							Gui->ShowError ("PIM_REQUIRE_LONG_PASSWORD");
-							return;
-						}
-
-						if (!Gui->AskYesNo (LangString ["PASSWORD_LENGTH_WARNING"], false, true))
-						{
-							NewPasswordPanel->SetFocusToPasswordTextCtrl();
-							return;
-						}
-					}
-					else if (newPim > 0 && newPim < 485)
-					{
-						if (!Gui->AskYesNo (LangString ["PIM_SMALL_WARNING"], false, true))
-						{
-							NewPasswordPanel->SetFocusToPimTextCtrl();
-							return;
-						}
-					}
-				}
 			}
 			else
 			{
-				newPassword = CurrentPasswordPanel->GetPassword();
+				newPassword = currentPassword;
 				newPim = CurrentPasswordPanel->GetVolumePim();
 			}
 
+			if (DialogMode == Mode::ChangePkcs5Prf)
+			{
+				if (!CheckCustomPimForKdfOnlyChange (CurrentPasswordPanel, newPassword, newKdf, currentPim))
+					return;
+			}
+
 			shared_ptr <KeyfileList> newKeyfiles;
 			if (DialogMode == Mode::ChangePasswordAndKeyfiles || DialogMode == Mode::ChangeKeyfiles)
 				newKeyfiles = NewPasswordPanel->GetKeyfiles();
 			else if (DialogMode != Mode::RemoveAllKeyfiles)
-				newKeyfiles = CurrentPasswordPanel->GetKeyfiles();
-
-			/* force the display of the random enriching interface */
-			RandomNumberGenerator::SetEnrichedByUserStatus (false);
-			Gui->UserEnrichRandomPool (this, NewPasswordPanel->GetPkcs5Kdf() ? NewPasswordPanel->GetPkcs5Kdf()->GetHash() : shared_ptr <Hash>());
+				newKeyfiles = currentKeyfiles;
 
+			shared_ptr <Pkcs5Kdf> effectiveNewKdf = newKdf ? newKdf : currentKdf;
+			shared_ptr <Volume> openVolume;
 			bool masterKeyVulnerable = false;
+			// If the unchanged KDF is not known yet, open the header before applying KDF-specific PIM limits.
+			bool needOpenVolumeForKdf = DialogMode == Mode::ChangePasswordAndKeyfiles
+				&& !effectiveNewKdf
+				&& newPassword->Size() > 0
+				&& newPim > 0;
+
+			if (!needOpenVolumeForKdf)
+			{
+				if (DialogMode == Mode::ChangePasswordAndKeyfiles
+					&& !CheckPasswordChangeWarnings (NewPasswordPanel, newPassword, newPim, effectiveNewKdf))
+				{
+					return;
+				}
+
+				/* force the display of the random enriching interface */
+				RandomNumberGenerator::SetEnrichedByUserStatus (false);
+				Gui->UserEnrichRandomPool (this, newKdf ? newKdf->GetHash() : shared_ptr <Hash>());
+			}
+
 			{
 #ifdef TC_UNIX
 				// Temporarily take ownership of a device if the user is not an administrator
@@ -189,12 +251,47 @@ namespace VeraCrypt
 						Core->SetFileOwner (finally_arg, finally_arg2);
 				});
 #endif
-				wxBusyCursor busy;
-				ChangePasswordThreadRoutine routine(Path,	Gui->GetPreferences().DefaultMountOptions.PreserveTimestamps,
-					CurrentPasswordPanel->GetPassword(), CurrentPasswordPanel->GetVolumePim(), CurrentPasswordPanel->GetPkcs5Kdf(), CurrentPasswordPanel->GetKeyfiles(),
-					newPassword, newPim, newKeyfiles, NewPasswordPanel->GetPkcs5Kdf(), NewPasswordPanel->GetHeaderWipeCount(), Gui->GetPreferences().EMVSupportEnabled);
-				Gui->ExecuteWaitThreadRoutine (this, &routine);
-				masterKeyVulnerable = routine.m_masterKeyVulnerable;
+				if (needOpenVolumeForKdf)
+				{
+					wxBusyCursor busy;
+					OpenVolumeThreadRoutine openRoutine(Path, preserveTimestamps, currentPassword, currentPim, currentKdf, currentKeyfiles, emvSupportEnabled);
+					Gui->ExecuteWaitThreadRoutine (this, &openRoutine);
+					openVolume = openRoutine.m_pVolume;
+					if (openVolume)
+						effectiveNewKdf = openVolume->GetPkcs5Kdf();
+					if (!effectiveNewKdf)
+						throw ParameterIncorrect (SRC_POS);
+				}
+
+				if (needOpenVolumeForKdf)
+				{
+					if (!CheckPasswordChangeWarnings (NewPasswordPanel, newPassword, newPim, effectiveNewKdf))
+					{
+						// The volume was opened only to detect its KDF; no header rewrite has started.
+						return;
+					}
+
+					/* force the display of the random enriching interface */
+					RandomNumberGenerator::SetEnrichedByUserStatus (false);
+					Gui->UserEnrichRandomPool (this, newKdf ? newKdf->GetHash() : shared_ptr <Hash>());
+				}
+
+				if (openVolume)
+				{
+					wxBusyCursor busy;
+					ChangePasswordThreadRoutine routine(openVolume, newPassword, newPim, newKeyfiles, newKdf, headerWipeCount, emvSupportEnabled);
+					Gui->ExecuteWaitThreadRoutine (this, &routine);
+					masterKeyVulnerable = routine.m_masterKeyVulnerable;
+				}
+				else
+				{
+					wxBusyCursor busy;
+					ChangePasswordThreadRoutine routine(Path, preserveTimestamps,
+						currentPassword, currentPim, currentKdf, currentKeyfiles,
+						newPassword, newPim, newKeyfiles, newKdf, headerWipeCount, emvSupportEnabled);
+					Gui->ExecuteWaitThreadRoutine (this, &routine);
+					masterKeyVulnerable = routine.m_masterKeyVulnerable;
+				}
 			}
 
 			switch (DialogMode)

src/Main/Forms/EncryptionOptionsWizardPage.cpp

@@ -12,7 +12,7 @@
 
 #include "System.h"
 #include "Volume/EncryptionTest.h"
-#include "Volume/Hash.h"
+#include "Volume/Pkcs5Kdf.h"
 #include "Main/GraphicUserInterface.h"
 #include "BenchmarkDialog.h"
 #include "EncryptionOptionsWizardPage.h"
@@ -36,11 +36,11 @@ namespace VeraCrypt
 
 		EncryptionAlgorithmChoice->Select (0);
 
-		Hashes = Hash::GetAvailableAlgorithms();
-		foreach (shared_ptr <Hash> hash, Hashes)
+		Kdfs = Pkcs5Kdf::GetAvailableAlgorithms();
+		foreach (shared_ptr <Pkcs5Kdf> kdf, Kdfs)
 		{
-			if (!hash->IsDeprecated())
-				HashChoice->Append (hash->GetName(), hash.get());
+			if (!kdf->IsDeprecated())
+				HashChoice->Append (kdf->GetName(), kdf.get());
 		}
 
 		HashChoice->Select (0);
@@ -68,9 +68,9 @@ namespace VeraCrypt
 		return Gui->GetSelectedData <EncryptionAlgorithm> (EncryptionAlgorithmChoice)->GetNew();
 	}
 
-	shared_ptr <Hash> EncryptionOptionsWizardPage::GetHash () const
+	shared_ptr <Pkcs5Kdf> EncryptionOptionsWizardPage::GetPkcs5Kdf () const
 	{
-		return Gui->GetSelectedData <Hash> (HashChoice)->GetNew();
+		return shared_ptr <Pkcs5Kdf> (Gui->GetSelectedData <Pkcs5Kdf> (HashChoice)->Clone());
 	}
 
 	void EncryptionOptionsWizardPage::OnBenchmarkButtonClick (wxCommandEvent& event)
@@ -155,9 +155,9 @@ namespace VeraCrypt
 		}
 	}
 
-	void EncryptionOptionsWizardPage::SetHash (shared_ptr <Hash> hash)
+	void EncryptionOptionsWizardPage::SetPkcs5Kdf (shared_ptr <Pkcs5Kdf> kdf)
 	{
-		if (hash)
-			HashChoice->SetStringSelection (hash->GetName());
+		if (kdf)
+			HashChoice->SetStringSelection (kdf->GetName());
 	}
 }

src/Main/Forms/EncryptionOptionsWizardPage.h

@@ -14,6 +14,7 @@
 #define TC_HEADER_Main_Forms_EncryptionOptionsWizardPage
 
 #include "Forms.h"
+#include "Volume/Pkcs5Kdf.h"
 
 namespace VeraCrypt
 {
@@ -26,11 +27,11 @@ namespace VeraCrypt
 		~EncryptionOptionsWizardPage ();
 #endif
 		shared_ptr <EncryptionAlgorithm> GetEncryptionAlgorithm () const;
-		shared_ptr <Hash> GetHash () const;
+		shared_ptr <Pkcs5Kdf> GetPkcs5Kdf () const;
 		bool IsValid () { return true; }
 		void SetPageText (const wxString &text) { }
 		void SetEncryptionAlgorithm (shared_ptr <EncryptionAlgorithm> algorithm);
-		void SetHash (shared_ptr <Hash> hash);
+		void SetPkcs5Kdf (shared_ptr <Pkcs5Kdf> kdf);
 
 	protected:
 		void OnBenchmarkButtonClick (wxCommandEvent& event);
@@ -44,7 +45,7 @@ namespace VeraCrypt
 		void HandleOnSize( wxSizeEvent& event );
 #endif
 		EncryptionAlgorithmList EncryptionAlgorithms;
-		HashList Hashes;
+		Pkcs5KdfList Kdfs;
 	};
 }
 

src/Main/Forms/MainFrame.cpp

@@ -651,7 +651,7 @@ namespace VeraCrypt
 			MountOptions mountOptions (GetPreferences().DefaultMountOptions);
 			if (CmdLine->ArgHash)
 			{
-				mountOptions.Kdf = Pkcs5Kdf::GetAlgorithm (*CmdLine->ArgHash);
+				mountOptions.Kdf = CmdLine->ArgHash;
 			}
 			if (CmdLine->ArgPim > 0)
 			{
@@ -676,7 +676,7 @@ namespace VeraCrypt
 			MountOptions mountOptions (GetPreferences().DefaultMountOptions);
 			if (CmdLine->ArgHash)
 			{
-				mountOptions.Kdf = Pkcs5Kdf::GetAlgorithm (*CmdLine->ArgHash);
+				mountOptions.Kdf = CmdLine->ArgHash;
 			}
 			if (CmdLine->ArgPim > 0)
 			{
@@ -707,7 +707,7 @@ namespace VeraCrypt
 		mountOptions.Path = GetSelectedVolumePath();
 		if (CmdLine->ArgHash)
 		{
-			mountOptions.Kdf = Pkcs5Kdf::GetAlgorithm (*CmdLine->ArgHash);
+			mountOptions.Kdf = CmdLine->ArgHash;
 		}
 		if (CmdLine->ArgPim > 0)
 		{
@@ -962,7 +962,7 @@ namespace VeraCrypt
 			MountOptions mountOptions (GetPreferences().DefaultMountOptions);
 			if (CmdLine->ArgHash)
 			{
-				mountOptions.Kdf = Pkcs5Kdf::GetAlgorithm (*CmdLine->ArgHash);
+				mountOptions.Kdf = CmdLine->ArgHash;
 			}
 			if (CmdLine->ArgPim > 0)
 			{

src/Main/Forms/VolumeCreationWizard.cpp

@@ -174,7 +174,7 @@ namespace VeraCrypt
 					page->SetPageTitle (LangString["CIPHER_TITLE"]);
 
 				page->SetEncryptionAlgorithm (SelectedEncryptionAlgorithm);
-				page->SetHash (SelectedHash);
+				page->SetPkcs5Kdf (SelectedKdf);
 				return page;
 			}
 
@@ -249,7 +249,7 @@ namespace VeraCrypt
 				else
 					page->SetPageTitle (LangString["PIM_TITLE"]);
 
-				page->SetPageText (LangString["PIM_HELP"]);
+				page->SetPageText (LangString[SelectedKdf ? SelectedKdf->GetPimHelpMessageId() : "PIM_HELP"]);
 				page->SetVolumePim (Pim);
 				return page;
 			}
@@ -708,10 +708,10 @@ namespace VeraCrypt
 			{
 				EncryptionOptionsWizardPage *page = dynamic_cast <EncryptionOptionsWizardPage *> (GetCurrentPage());
 				SelectedEncryptionAlgorithm = page->GetEncryptionAlgorithm ();
-				SelectedHash = page->GetHash ();
+				SelectedKdf = page->GetPkcs5Kdf ();
 
 				if (forward)
-					RandomNumberGenerator::SetHash (SelectedHash);
+					RandomNumberGenerator::SetHash (SelectedKdf->GetHash());
 
 				if (SelectedVolumePath.IsDevice() && (OuterVolume || SelectedVolumeType != VolumeType::Hidden))
 					return Step::VolumePassword;
@@ -870,17 +870,23 @@ namespace VeraCrypt
 
 				if (forward && Password && !Password->IsEmpty())
 				{
-					if (Password->Size() < VolumePassword::WarningSizeThreshold)
+					if (!SelectedKdf)
 					{
-						if (Pim > 0 && Pim < 485)
+						Gui->ShowError ("PARAMETER_INCORRECT");
+						return GetCurrentStep();
+					}
+
+					if (Password->Size() < VolumePassword::SmallPimPasswordSizeThreshold)
+					{
+						if (Pim > 0 && Pim < SelectedKdf->GetDefaultPim())
 						{
-							Gui->ShowError ("PIM_REQUIRE_LONG_PASSWORD");
+							Gui->ShowError (SelectedKdf->GetPimRequireLongPasswordMessageId());
 							return GetCurrentStep();
 						}
 					}
-					else if (Pim > 0 && Pim < 485)
+					else if (Pim > 0 && Pim < SelectedKdf->GetDefaultPim())
 					{
-						if (!Gui->AskYesNo (LangString["PIM_SMALL_WARNING"], false, true))
+						if (!Gui->AskYesNo (LangString[SelectedKdf->GetPimSmallWarningMessageId()], false, true))
 						{
 							return GetCurrentStep();
 						}
@@ -1031,7 +1037,7 @@ namespace VeraCrypt
 						options->Quick = QuickFormatEnabled;
 						options->Size = VolumeSize;
 						options->Type = OuterVolume ? VolumeType::Normal : SelectedVolumeType;
-						options->VolumeHeaderKdf = Pkcs5Kdf::GetAlgorithm (*SelectedHash);
+						options->VolumeHeaderKdf = SelectedKdf;
 						options->EMVSupportEnabled = Gui->GetPreferences().EMVSupportEnabled;
 
 

src/Main/Forms/VolumeCreationWizard.h

@@ -87,7 +87,7 @@ namespace VeraCrypt
 		int OuterPim;
 		shared_ptr <Pkcs5Kdf> Kdf;
 		uint32 SectorSize;
-		shared_ptr <Hash> SelectedHash;
+		shared_ptr <Pkcs5Kdf> SelectedKdf;
 		uint64 VolumeSize;
 
 	private:

src/Main/GraphicUserInterface.h

@@ -34,7 +34,7 @@ namespace VeraCrypt
 		virtual void BackupVolumeHeaders (shared_ptr <VolumePath> volumePath) const;
 		virtual void BeginBusyState () const { wxBeginBusyCursor(); }
 		virtual void BeginInteractiveBusyState (wxWindow *window);
-		virtual void ChangePassword (shared_ptr <VolumePath> volumePath = shared_ptr <VolumePath>(), shared_ptr <VolumePassword> password = shared_ptr <VolumePassword>(), int pim = 0, shared_ptr <Hash> currentHash = shared_ptr <Hash>(), shared_ptr <KeyfileList> keyfiles = shared_ptr <KeyfileList>(), shared_ptr <VolumePassword> newPassword = shared_ptr <VolumePassword>(), int newPim = 0, shared_ptr <KeyfileList> newKeyfiles = shared_ptr <KeyfileList>(), shared_ptr <Hash> newHash = shared_ptr <Hash>()) const { ThrowTextModeRequired(); }
+		virtual void ChangePassword (shared_ptr <VolumePath> volumePath = shared_ptr <VolumePath>(), shared_ptr <VolumePassword> password = shared_ptr <VolumePassword>(), int pim = 0, shared_ptr <Pkcs5Kdf> currentKdf = shared_ptr <Pkcs5Kdf>(), shared_ptr <KeyfileList> keyfiles = shared_ptr <KeyfileList>(), shared_ptr <VolumePassword> newPassword = shared_ptr <VolumePassword>(), int newPim = 0, shared_ptr <KeyfileList> newKeyfiles = shared_ptr <KeyfileList>(), shared_ptr <Pkcs5Kdf> newKdf = shared_ptr <Pkcs5Kdf>()) const { ThrowTextModeRequired(); }
 		wxHyperlinkCtrl *CreateHyperlink (wxWindow *parent, const wxString &linkUrl, const wxString &linkText) const;
 		virtual void CreateKeyfile (shared_ptr <FilePath> keyfilePath = shared_ptr <FilePath>()) const;
 		virtual void CreateVolume (shared_ptr <VolumeCreationOptions> options) const { ThrowTextModeRequired(); }

src/Main/TextUserInterface.cpp

@@ -30,6 +30,30 @@
 
 namespace VeraCrypt
 {
+	static bool CheckCustomPimForPassword (const TextUserInterface *ui, const shared_ptr <VolumePassword> &password, int pim, const shared_ptr <Pkcs5Kdf> &kdf, bool interactive)
+	{
+		int defaultPim = kdf ? kdf->GetDefaultPim() : 0;
+		if (!password || password->Size() == 0 || pim <= 0 || defaultPim <= 0 || pim >= defaultPim)
+			return true;
+
+		if (password->Size() < VolumePassword::SmallPimPasswordSizeThreshold)
+		{
+			const char *messageId = kdf ? kdf->GetPimRequireLongPasswordMessageId() : "PIM_REQUIRE_LONG_PASSWORD";
+			if (interactive)
+			{
+				ui->ShowError (messageId);
+				return false;
+			}
+
+			throw_err (LangString [messageId]);
+		}
+
+		if (interactive && !ui->AskYesNo (LangString [kdf ? kdf->GetPimSmallWarningMessageId() : "PIM_SMALL_WARNING"], false, true))
+			return false;
+
+		return true;
+	}
+
 	class AdminPasswordTextRequestHandler : public GetStringFunctor
 	{
 		public:
@@ -295,11 +319,7 @@ namespace VeraCrypt
 
 		ShowInfo ("EXTERNAL_VOL_HEADER_BAK_FIRST_INFO");
 
-		shared_ptr <Pkcs5Kdf> kdf;
-		if (CmdLine->ArgHash)
-		{
-			kdf = Pkcs5Kdf::GetAlgorithm (*CmdLine->ArgHash);
-		}
+		shared_ptr <Pkcs5Kdf> kdf = CmdLine->ArgHash;
 
 		shared_ptr <Volume> normalVolume;
 		shared_ptr <Volume> hiddenVolume;
@@ -468,7 +488,7 @@ namespace VeraCrypt
 			ShowWarning ("ERR_XTS_MASTERKEY_VULNERABLE");
 	}
 
-	void TextUserInterface::ChangePassword (shared_ptr <VolumePath> volumePath, shared_ptr <VolumePassword> password, int pim, shared_ptr <Hash> currentHash, shared_ptr <KeyfileList> keyfiles, shared_ptr <VolumePassword> newPassword, int newPim, shared_ptr <KeyfileList> newKeyfiles, shared_ptr <Hash> newHash) const
+	void TextUserInterface::ChangePassword (shared_ptr <VolumePath> volumePath, shared_ptr <VolumePassword> password, int pim, shared_ptr <Pkcs5Kdf> currentKdf, shared_ptr <KeyfileList> keyfiles, shared_ptr <VolumePassword> newPassword, int newPim, shared_ptr <KeyfileList> newKeyfiles, shared_ptr <Pkcs5Kdf> newKdf) const
 	{
 		shared_ptr <Volume> volume;
 
@@ -487,11 +507,7 @@ namespace VeraCrypt
 		bool passwordInteractive = !password.get();
 		bool keyfilesInteractive = !keyfiles.get();
 
-		shared_ptr<Pkcs5Kdf> kdf;
-		if (currentHash)
-		{
-			kdf = Pkcs5Kdf::GetAlgorithm (*currentHash);
-		}
+		shared_ptr <Pkcs5Kdf> kdf = currentKdf;
 
 		while (true)
 		{
@@ -555,8 +571,24 @@ namespace VeraCrypt
 			newPassword = AskPassword (_("Enter new password"), true);
 
 		// New PIM
-		if ((newPim < 0) && !Preferences.NonInteractive)
-			newPim = AskPim (_("Enter new PIM"));
+		shared_ptr <Pkcs5Kdf> effectiveNewKdf = newKdf ? newKdf : volume->GetPkcs5Kdf();
+		bool newPimInteractive = false;
+		while (true)
+		{
+			if ((newPim < 0) && !Preferences.NonInteractive)
+			{
+				newPim = AskPim (_("Enter new PIM"));
+				newPimInteractive = true;
+			}
+
+			if (CheckCustomPimForPassword (this, newPassword, newPim, effectiveNewKdf, !Preferences.NonInteractive))
+				break;
+
+			if (!newPimInteractive)
+				throw UserAbort (SRC_POS);
+
+			newPim = -1;
+		}
 
 		// New keyfiles
 		if (!newKeyfiles.get() && !Preferences.NonInteractive)
@@ -571,8 +603,7 @@ namespace VeraCrypt
 		RandomNumberGenerator::SetEnrichedByUserStatus (false);
 		UserEnrichRandomPool();
 
-		Core->ChangePassword (volume, newPassword, newPim, newKeyfiles, true,
-			newHash ? Pkcs5Kdf::GetAlgorithm (*newHash) : shared_ptr <Pkcs5Kdf>());
+		Core->ChangePassword (volume, newPassword, newPim, newKeyfiles, true, newKdf);
 
 		ShowInfo ("PASSWORD_CHANGED");
 	}
@@ -845,27 +876,26 @@ namespace VeraCrypt
 			options->EA = encryptionAlgorithms[AskSelection (encryptionAlgorithms.size(), 1) - 1];
 		}
 
-		// Hash algorithm
+		// Header key derivation function
 		if (!options->VolumeHeaderKdf)
 		{
 			if (Preferences.NonInteractive)
 				throw MissingArgument (SRC_POS);
 
-			ShowInfo (_("\nHash algorithm:"));
+			ShowInfo (_("\nKey derivation function:"));
 
-			vector < shared_ptr <Hash> > hashes;
-			foreach (shared_ptr <Hash> hash, Hash::GetAvailableAlgorithms())
+			vector < shared_ptr <Pkcs5Kdf> > kdfs;
+			foreach (shared_ptr <Pkcs5Kdf> kdf, Pkcs5Kdf::GetAvailableAlgorithms())
 			{
-				if (!hash->IsDeprecated())
+				if (!kdf->IsDeprecated())
 				{
-					ShowString (StringFormatter (L" {0}) {1}\n", (uint32) hashes.size() + 1, hash->GetName()));
-					hashes.push_back (hash);
+					ShowString (StringFormatter (L" {0}) {1}\n", (uint32) kdfs.size() + 1, kdf->GetName()));
+					kdfs.push_back (kdf);
 				}
 			}
 
-			shared_ptr <Hash> selectedHash = hashes[AskSelection (hashes.size(), 1) - 1];
-			RandomNumberGenerator::SetHash (selectedHash);
-			options->VolumeHeaderKdf = Pkcs5Kdf::GetAlgorithm (*selectedHash);
+			options->VolumeHeaderKdf = kdfs[AskSelection (kdfs.size(), 1) - 1];
+			RandomNumberGenerator::SetHash (options->VolumeHeaderKdf->GetHash());
 
 		}
 
@@ -939,10 +969,23 @@ namespace VeraCrypt
 		}
 
 		// PIM
-		if ((options->Pim < 0) && !Preferences.NonInteractive)
+		bool pimInteractive = false;
+		while (true)
 		{
-			ShowString (L"\n");
-			options->Pim = AskPim (_("Enter PIM"));
+			if ((options->Pim < 0) && !Preferences.NonInteractive)
+			{
+				ShowString (L"\n");
+				options->Pim = AskPim (_("Enter PIM"));
+				pimInteractive = true;
+			}
+
+			if (CheckCustomPimForPassword (this, options->Password, options->Pim, options->VolumeHeaderKdf, !Preferences.NonInteractive))
+				break;
+
+			if (!pimInteractive)
+				throw UserAbort (SRC_POS);
+
+			options->Pim = -1;
 		}
 
 		// Keyfiles
@@ -1546,11 +1589,7 @@ namespace VeraCrypt
 
 		// Ask whether to restore internal or external backup
 		bool restoreInternalBackup;
-		shared_ptr <Pkcs5Kdf> kdf;
-		if (CmdLine->ArgHash)
-		{
-			kdf = Pkcs5Kdf::GetAlgorithm (*CmdLine->ArgHash);
-		}
+		shared_ptr <Pkcs5Kdf> kdf = CmdLine->ArgHash;
 
 		ShowInfo (LangString["HEADER_RESTORE_EXTERNAL_INTERNAL"]);
 		ShowInfo (L"\n1) " + LangString["HEADER_RESTORE_INTERNAL"]);
@@ -1799,7 +1838,7 @@ namespace VeraCrypt
 			return;
 
 		if (CmdLine->ArgHash)
-			RandomNumberGenerator::SetHash (CmdLine->ArgHash);
+			RandomNumberGenerator::SetHash (CmdLine->ArgHash->GetHash());
 
 		if (!CmdLine->ArgRandomSourcePath.IsEmpty())
 		{

src/Main/TextUserInterface.h

@@ -37,7 +37,7 @@ namespace VeraCrypt
 		virtual bool AskYesNo (const wxString &message, bool defaultYes = false, bool warning = false) const;
 		virtual void BackupVolumeHeaders (shared_ptr <VolumePath> volumePath) const;
 		virtual void BeginBusyState () const { }
-		virtual void ChangePassword (shared_ptr <VolumePath> volumePath = shared_ptr <VolumePath>(), shared_ptr <VolumePassword> password = shared_ptr <VolumePassword>(), int pim = 0, shared_ptr <Hash> currentHash = shared_ptr <Hash>(), shared_ptr <KeyfileList> keyfiles = shared_ptr <KeyfileList>(), shared_ptr <VolumePassword> newPassword = shared_ptr <VolumePassword>(), int newPim = 0, shared_ptr <KeyfileList> newKeyfiles = shared_ptr <KeyfileList>(), shared_ptr <Hash> newHash = shared_ptr <Hash>()) const;
+		virtual void ChangePassword (shared_ptr <VolumePath> volumePath = shared_ptr <VolumePath>(), shared_ptr <VolumePassword> password = shared_ptr <VolumePassword>(), int pim = 0, shared_ptr <Pkcs5Kdf> currentKdf = shared_ptr <Pkcs5Kdf>(), shared_ptr <KeyfileList> keyfiles = shared_ptr <KeyfileList>(), shared_ptr <VolumePassword> newPassword = shared_ptr <VolumePassword>(), int newPim = 0, shared_ptr <KeyfileList> newKeyfiles = shared_ptr <KeyfileList>(), shared_ptr <Pkcs5Kdf> newKdf = shared_ptr <Pkcs5Kdf>()) const;
 		virtual void CreateKeyfile (shared_ptr <FilePath> keyfilePath = shared_ptr <FilePath>()) const;
 		virtual void CreateVolume (shared_ptr <VolumeCreationOptions> options) const;
 		virtual void DeleteSecurityTokenKeyfiles () const;

src/Main/UserInterface.cpp

@@ -1010,7 +1010,7 @@ const FileManager fileManagers[] = {
 				cmdLine.ArgMountOptions.SharedAccessAllowed = cmdLine.ArgForce;
 				if (cmdLine.ArgHash)
 				{
-					cmdLine.ArgMountOptions.Kdf = Pkcs5Kdf::GetAlgorithm (*cmdLine.ArgHash);
+					cmdLine.ArgMountOptions.Kdf = cmdLine.ArgHash;
 				}
 
 
@@ -1108,8 +1108,8 @@ const FileManager fileManagers[] = {
 
 				if (cmdLine.ArgHash)
 				{
-					options->VolumeHeaderKdf = Pkcs5Kdf::GetAlgorithm (*cmdLine.ArgHash);
-					RandomNumberGenerator::SetHash (cmdLine.ArgHash);
+					options->VolumeHeaderKdf = cmdLine.ArgHash;
+					RandomNumberGenerator::SetHash (cmdLine.ArgHash->GetHash());
 				}
 
 				options->EA = cmdLine.ArgEncryptionAlgorithm;
@@ -1270,9 +1270,9 @@ const FileManager fileManagers[] = {
 					" This option is not available on some platforms.\n"
 					"\n"
 					"--hash=HASH\n"
-					" Use specified hash algorithm when creating a new volume or changing password\n"
-					" and/or keyfiles. This option also specifies the mixing PRF of the random\n"
-					" number generator.\n"
+					" Use specified header key derivation algorithm when creating a new volume\n"
+					" or changing password and/or keyfiles. This option also specifies the\n"
+					" mixing hash of the random number generator.\n"
 					"\n"
 					"-k, --keyfiles=KEYFILE1[,KEYFILE2,KEYFILE3,...]\n"
 					" Use specified keyfiles when mounting a volume or when changing password\n"

src/Main/UserInterface.h

@@ -33,7 +33,7 @@ namespace VeraCrypt
 		virtual bool AskYesNo (const wxString &message, bool defaultYes = false, bool warning = false) const = 0;
 		virtual void BackupVolumeHeaders (shared_ptr <VolumePath> volumePath) const = 0;
 		virtual void BeginBusyState () const = 0;
-		virtual void ChangePassword (shared_ptr <VolumePath> volumePath = shared_ptr <VolumePath>(), shared_ptr <VolumePassword> password = shared_ptr <VolumePassword>(), int pim = 0, shared_ptr <Hash> currentHash = shared_ptr <Hash>(), shared_ptr <KeyfileList> keyfiles = shared_ptr <KeyfileList>(), shared_ptr <VolumePassword> newPassword = shared_ptr <VolumePassword>(), int newPim = 0, shared_ptr <KeyfileList> newKeyfiles = shared_ptr <KeyfileList>(), shared_ptr <Hash> newHash = shared_ptr <Hash>()) const = 0;
+		virtual void ChangePassword (shared_ptr <VolumePath> volumePath = shared_ptr <VolumePath>(), shared_ptr <VolumePassword> password = shared_ptr <VolumePassword>(), int pim = 0, shared_ptr <Pkcs5Kdf> currentKdf = shared_ptr <Pkcs5Kdf>(), shared_ptr <KeyfileList> keyfiles = shared_ptr <KeyfileList>(), shared_ptr <VolumePassword> newPassword = shared_ptr <VolumePassword>(), int newPim = 0, shared_ptr <KeyfileList> newKeyfiles = shared_ptr <KeyfileList>(), shared_ptr <Pkcs5Kdf> newKdf = shared_ptr <Pkcs5Kdf>()) const = 0;
 		virtual void CheckRequirementsForMountingVolume () const;
 		virtual void CloseExplorerWindows (shared_ptr <VolumeInfo> mountedVolume) const;
 		virtual void CreateKeyfile (shared_ptr <FilePath> keyfilePath = shared_ptr <FilePath>()) const = 0;

src/Mount/Mount.c

@@ -2919,6 +2919,7 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				&& pwdChangeDlgMode == PCDM_CHANGE_PASSWORD)
 			{
 				int bootPRF = pkcs5;
+				int pimValidationValue = pim;
 				if (bSysEncPwdChangeDlgMode)
 				{
 					try
@@ -2930,7 +2931,17 @@ BOOL CALLBACK PasswordChangeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 					catch(...)
 					{}
 				}
-				if (!CheckPasswordLength (hwndDlg, GetWindowTextLength(GetDlgItem (hwndDlg, IDC_PASSWORD)), pim, bSysEncPwdChangeDlgMode, bootPRF, FALSE, FALSE))
+				else if (bootPRF == 0)
+				{
+					bootPRF = old_pkcs5;
+					if (bootPRF == 0)
+					{
+						/* Both current and new KDFs are autodetected. ChangePwd() repeats this
+						PIM/password-length validation after opening the header with the detected KDF. */
+						pimValidationValue = 0;
+					}
+				}
+				if (!CheckPasswordLength (hwndDlg, GetWindowTextLength(GetDlgItem (hwndDlg, IDC_PASSWORD)), pimValidationValue, bSysEncPwdChangeDlgMode, bootPRF, FALSE, FALSE))
 					return 1;
 			}
 

src/Mount/Mount.rc

@@ -172,9 +172,9 @@ BEGIN
     RTEXT           "Wipe mode:",IDT_WIPE_MODE,9,220,74,8,0,WS_EX_RIGHT
     RTEXT           "KDF:",IDT_KDF,12,34,74,10,SS_CENTERIMAGE
     RTEXT           "Volume PIM:",IDT_OLD_PIM,12,54,74,10,NOT WS_VISIBLE
-    LTEXT           "(Empty or 0 for default iterations)",IDC_OLD_PIM_HELP,135,54,196,8,NOT WS_VISIBLE
+    LTEXT           "(Empty or 0 for defaults)",IDC_OLD_PIM_HELP,135,54,196,8,NOT WS_VISIBLE
     RTEXT           "Volume PIM:",IDT_PIM,9,157,75,16,NOT WS_VISIBLE
-    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,135,157,197,8,NOT WS_VISIBLE
+    LTEXT           "(Empty or 0 for defaults)",IDC_PIM_HELP,135,157,197,8,NOT WS_VISIBLE
 END
 
 IDD_MOUNT_DLG DIALOGEX 0, 0, 375, 271
@@ -222,7 +222,7 @@ BEGIN
     CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,87,99,11
     PUSHBUTTON      "&Keyfiles...",IDC_KEY_FILES,173,84,75,14
     PUSHBUTTON      "Mount Opti&ons...",IDC_MOUNT_OPTIONS,252,84,69,14
-    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,115,46,199,8,NOT WS_VISIBLE
+    LTEXT           "(Empty or 0 for defaults)",IDC_PIM_HELP,115,46,199,8,NOT WS_VISIBLE
     DEFPUSHBUTTON   "OK",IDOK,252,8,69,14
     PUSHBUTTON      "Cancel",IDCANCEL,252,25,69,14
     RTEXT           "Password:",IDT_PASSWORD,0,10,65,13
@@ -413,7 +413,7 @@ BEGIN
     LTEXT           "Label of selected favorite volume:",IDT_FAVORITE_LABEL,18,215,202,8
     GROUPBOX        "Global Settings",IDC_FAV_VOL_OPTIONS_GLOBAL_SETTINGS_BOX,7,300,366,42
     EDITTEXT        IDC_PIM,87,183,42,13,ES_RIGHT | ES_PASSWORD | ES_AUTOHSCROLL | ES_NUMBER
-    LTEXT           "(Empty or 0 for default iterations)",IDC_PIM_HELP,135,186,189,8
+    LTEXT           "(Empty or 0 for defaults)",IDC_PIM_HELP,135,186,189,8
     LTEXT           "Volume PIM:",IDT_PIM,18,185,65,8
     CONTROL         "Display PIM",IDC_SHOW_PIM,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,18,200,150,10
     CONTROL         "Use favorite label as Explorer drive label",IDC_FAVORITE_USE_LABEL_IN_EXPLORER,

src/Volume/EncryptionTest.cpp

@@ -21,9 +21,47 @@
 #endif
 #include "EncryptionTest.h"
 #include "Pkcs5Kdf.h"
+#include "VolumeHeader.h"
 
 namespace VeraCrypt
 {
+#if !defined (WOLFCRYPT_BACKEND) && !defined (VC_DCS_DISABLE_ARGON2)
+	class FailingArgon2Kdf : public Pkcs5Kdf
+	{
+	public:
+		FailingArgon2Kdf () : Pkcs5Kdf() { }
+		virtual ~FailingArgon2Kdf () { }
+
+		virtual int DeriveKey (const BufferPtr &key, const VolumePassword &password, int pim, const ConstBufferPtr &salt) const
+		{
+			(void) key;
+			(void) password;
+			(void) pim;
+			(void) salt;
+			return 1;
+		}
+
+		virtual int DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
+		{
+			(void) key;
+			(void) password;
+			(void) salt;
+			(void) iterationCount;
+			return 1;
+		}
+
+		virtual shared_ptr <Hash> GetHash () const { return shared_ptr <Hash> (new Blake2b); }
+		virtual int GetIterationCount (int pim) const { return 1; }
+		virtual wstring GetName () const { return L"Argon2"; }
+		virtual Pkcs5Kdf* Clone () const { return new FailingArgon2Kdf(); }
+		virtual bool IsArgon2 () const { return true; }
+
+	private:
+		FailingArgon2Kdf (const FailingArgon2Kdf &);
+		FailingArgon2Kdf &operator= (const FailingArgon2Kdf &);
+	};
+#endif
+
 	void EncryptionTest::TestAll ()
 	{
 		TestAll (false);
@@ -1127,37 +1165,131 @@ namespace VeraCrypt
 
          #ifndef WOLFCRYPT_BACKEND
 		Pkcs5HmacBlake2s pkcs5HmacBlake2s;
-		pkcs5HmacBlake2s.DeriveKey (derivedKey, password, salt, 5);
+		if (pkcs5HmacBlake2s.DeriveKey (derivedKey, password, salt, 5) != 0)
+			throw TestFailed (SRC_POS);
 		if (memcmp (derivedKey.Ptr(), "\x8d\x51\xfa\x31", 4) != 0)
 			throw TestFailed (SRC_POS);
 
 		Pkcs5HmacSha512 pkcs5HmacSha512;
-		pkcs5HmacSha512.DeriveKey (derivedKey, password, salt, 5);
+		if (pkcs5HmacSha512.DeriveKey (derivedKey, password, salt, 5) != 0)
+			throw TestFailed (SRC_POS);
 		if (memcmp (derivedKey.Ptr(), "\x13\x64\xae\xf8", 4) != 0)
 			throw TestFailed (SRC_POS);
 
 		Pkcs5HmacWhirlpool pkcs5HmacWhirlpool;
-		pkcs5HmacWhirlpool.DeriveKey (derivedKey, password, salt, 5);
+		if (pkcs5HmacWhirlpool.DeriveKey (derivedKey, password, salt, 5) != 0)
+			throw TestFailed (SRC_POS);
 		if (memcmp (derivedKey.Ptr(), "\x50\x7c\x36\x6f", 4) != 0)
 			throw TestFailed (SRC_POS);
 
 		Pkcs5HmacSha256 pkcs5HmacSha256;
-		pkcs5HmacSha256.DeriveKey (derivedKey, password, salt, 5);
+		if (pkcs5HmacSha256.DeriveKey (derivedKey, password, salt, 5) != 0)
+			throw TestFailed (SRC_POS);
 		if (memcmp (derivedKey.Ptr(), "\xf2\xa0\x4f\xb2", 4) != 0)
 			throw TestFailed (SRC_POS);
 		
 		Pkcs5HmacStreebog pkcs5HmacStreebog;
-		pkcs5HmacStreebog.DeriveKey (derivedKey, password, salt, 5);
+		if (pkcs5HmacStreebog.DeriveKey (derivedKey, password, salt, 5) != 0)
+			throw TestFailed (SRC_POS);
 		if (memcmp (derivedKey.Ptr(), "\xd0\x53\xa2\x30", 4) != 0)
 			throw TestFailed (SRC_POS);
+
+	#ifndef VC_DCS_DISABLE_ARGON2
+		Pkcs5Argon2 pkcs5Argon2;
+		static const uint8 argon2SaltData[] = { 's', 'o', 'm', 'e', 's', 'a', 'l', 't' };
+		static const uint8 argon2Pim1DerivedKey[] =
+		{
+			0x9e, 0x87, 0x89, 0xc8, 0xb4, 0x28, 0x34, 0x22,
+			0x0a, 0xfc, 0x00, 0x08, 0x5a, 0xc7, 0x3a, 0xcc,
+			0x30, 0x86, 0x51, 0x21, 0x69, 0x94, 0xab, 0xbf,
+			0xdd, 0xd6, 0x9b, 0x25, 0x92, 0x03, 0x2e, 0xfd
+		};
+		ConstBufferPtr argon2Salt (argon2SaltData, sizeof (argon2SaltData));
+		Buffer argon2DerivedKey (sizeof (argon2Pim1DerivedKey));
+
+		// PIM 1 maps to Argon2id t=3, m=64 MiB, p=1.
+		if (pkcs5Argon2.DeriveKey (argon2DerivedKey, password, 1, argon2Salt) != 0)
+			throw TestFailed (SRC_POS);
+		if (memcmp (argon2DerivedKey.Ptr(), argon2Pim1DerivedKey, sizeof (argon2Pim1DerivedKey)) != 0)
+			throw TestFailed (SRC_POS);
+
+		try
+		{
+			if (pkcs5Argon2.DeriveKey (derivedKey, password, salt, 5) != 0)
+				throw TestFailed (SRC_POS);
+			throw TestFailed (SRC_POS);
+		}
+		catch (ParameterIncorrect&)
+		{
+		}
+
+		shared_ptr <Pkcs5Kdf> sha512Kdf (new Pkcs5HmacSha512);
+		shared_ptr <Pkcs5Kdf> failingArgon2Kdf (new FailingArgon2Kdf);
+		shared_ptr <EncryptionAlgorithm> ea (new AES);
+		SecureBuffer headerBuffer (TC_VOLUME_HEADER_SIZE);
+		SecureBuffer dataKey (ea->GetKeySize() * 2);
+		SecureBuffer headerSalt (VolumeHeader::GetSaltSize());
+		SecureBuffer headerKey (VolumeHeader::GetLargestSerializedKeySize());
+
+		for (size_t i = 0; i < dataKey.Size(); ++i)
+			dataKey.Ptr()[i] = (uint8) (i + 1);
+
+		for (size_t i = 0; i < headerSalt.Size(); ++i)
+			headerSalt.Ptr()[i] = (uint8) (i + 2);
+
+		if (sha512Kdf->DeriveKey (headerKey, password, 1, headerSalt) != 0)
+			throw TestFailed (SRC_POS);
+
+		VolumeHeaderCreationOptions options;
+		options.DataKey = dataKey;
+		options.EA = ea;
+		options.Kdf = sha512Kdf;
+		options.HeaderKey = headerKey;
+		options.Salt = headerSalt;
+		options.SectorSize = TC_SECTOR_SIZE_FILE_HOSTED_VOLUME;
+		options.VolumeDataStart = TC_VOLUME_HEADER_GROUP_SIZE;
+		options.VolumeDataSize = TC_MIN_VOLUME_SIZE;
+		options.Type = VolumeType::Normal;
+
+		VolumeHeader header (TC_VOLUME_HEADER_SIZE);
+		header.Create (headerBuffer, options);
+
+		Pkcs5KdfList kdfs;
+		kdfs.push_back (failingArgon2Kdf);
+		kdfs.push_back (sha512Kdf);
+
+		EncryptionAlgorithmList encryptionAlgorithms;
+		encryptionAlgorithms.push_back (shared_ptr <EncryptionAlgorithm> (new AES));
+
+		EncryptionModeList encryptionModes;
+		encryptionModes.push_back (shared_ptr <EncryptionMode> (new EncryptionModeXTS));
+
+		VolumeHeader decryptedHeader (TC_VOLUME_HEADER_SIZE);
+		if (!decryptedHeader.Decrypt (headerBuffer, password, 1, shared_ptr <Pkcs5Kdf> (), kdfs, encryptionAlgorithms, encryptionModes)
+			|| decryptedHeader.GetPkcs5Kdf()->GetName() != sha512Kdf->GetName())
+		{
+			throw TestFailed (SRC_POS);
+		}
+
+		try
+		{
+			decryptedHeader.Decrypt (headerBuffer, password, 1, failingArgon2Kdf, kdfs, encryptionAlgorithms, encryptionModes);
+			throw TestFailed (SRC_POS);
+		}
+		catch (ExternalException&)
+		{
+		}
+	#endif
          #else
                Pkcs5HmacSha256 pkcs5HmacSha256;
-		pkcs5HmacSha256.DeriveKey (derivedKey, password, salt, 5);
+		if (pkcs5HmacSha256.DeriveKey (derivedKey, password, salt, 5) != 0)
+			throw TestFailed (SRC_POS);
 		if (memcmp (derivedKey.Ptr(), "\x64\xf3\xa5\xa3", 4) != 0)
 			throw TestFailed (SRC_POS);
 
 		Pkcs5HmacSha512 pkcs5HmacSha512;	
-                pkcs5HmacSha512.DeriveKey (derivedKey, password, salt, 5);
+		if (pkcs5HmacSha512.DeriveKey (derivedKey, password, salt, 5) != 0)
+			throw TestFailed (SRC_POS);
 		if (memcmp (derivedKey.Ptr(), "\x55\xa1\x76\xbb", 4) != 0)
 			throw TestFailed (SRC_POS);
         #endif	

src/Volume/Pkcs5Kdf.cpp

@@ -11,8 +11,12 @@
 */
 
 #include "Common/Pkcs5.h"
+#include "Platform/StringConverter.h"
 #include "Pkcs5Kdf.h"
 #include "VolumePassword.h"
+#if !defined (WOLFCRYPT_BACKEND) && !defined (VC_DCS_DISABLE_ARGON2)
+#include "argon2.h"
+#endif
 
 namespace VeraCrypt
 {
@@ -24,16 +28,22 @@ namespace VeraCrypt
 	{
 	}
 
-	void Pkcs5Kdf::DeriveKey (const BufferPtr &key, const VolumePassword &password, int pim, const ConstBufferPtr &salt) const
+	int Pkcs5Kdf::DeriveKey (const BufferPtr &key, const VolumePassword &password, int pim, const ConstBufferPtr &salt) const
 	{
-		DeriveKey (key, password, salt, GetIterationCount(pim));
+		return DeriveKey (key, password, salt, GetIterationCount(pim));
+	}
+
+	wstring Pkcs5Kdf::GetDerivationFailureMessage (int result) const
+	{
+		(void) result;
+		return L"Key derivation failed";
 	}
 
 	shared_ptr <Pkcs5Kdf> Pkcs5Kdf::GetAlgorithm (const wstring &name)
 	{
 		foreach (shared_ptr <Pkcs5Kdf> kdf, GetAvailableAlgorithms())
 		{
-			if (kdf->GetName() == name)
+			if (kdf->GetName() == name || (kdf->IsArgon2() && name == L"Argon2id"))
 				return kdf;
 		}
 		throw ParameterIncorrect (SRC_POS);
@@ -43,6 +53,9 @@ namespace VeraCrypt
 	{
 		foreach (shared_ptr <Pkcs5Kdf> kdf, GetAvailableAlgorithms())
 		{
+			if (kdf->IsArgon2())
+				continue;
+
 			if (typeid (*kdf->GetHash()) == typeid (hash))
 				return kdf;
 		}
@@ -60,6 +73,9 @@ namespace VeraCrypt
 		l.push_back (shared_ptr <Pkcs5Kdf> (new Pkcs5HmacBlake2s ()));
                 l.push_back (shared_ptr <Pkcs5Kdf> (new Pkcs5HmacWhirlpool ()));
 		l.push_back (shared_ptr <Pkcs5Kdf> (new Pkcs5HmacStreebog ()));
+        #ifndef VC_DCS_DISABLE_ARGON2
+		l.push_back (shared_ptr <Pkcs5Kdf> (new Pkcs5Argon2 ()));
+        #endif
         #endif
 		return l;
 	}
@@ -71,54 +87,96 @@ namespace VeraCrypt
 	}
 
     #ifndef WOLFCRYPT_BACKEND
-	void Pkcs5HmacBlake2s_Boot::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
+	int Pkcs5HmacBlake2s_Boot::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
 	{
 		ValidateParameters (key, password, salt, iterationCount);
 		derive_key_blake2s (password.DataPtr(), (int) password.Size(), salt.Get(), (int) salt.Size(), iterationCount, key.Get(), (int) key.Size(), NULL);
+		return 0;
 	}
 
-	void Pkcs5HmacBlake2s::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
+	int Pkcs5HmacBlake2s::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
 	{
 		ValidateParameters (key, password, salt, iterationCount);
 		derive_key_blake2s (password.DataPtr(), (int) password.Size(), salt.Get(), (int) salt.Size(), iterationCount, key.Get(), (int) key.Size(), NULL);
+		return 0;
 	}
     #endif
 
-	void Pkcs5HmacSha256_Boot::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
+	int Pkcs5HmacSha256_Boot::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
 	{
 		ValidateParameters (key, password, salt, iterationCount);
 		derive_key_sha256 (password.DataPtr(), (int) password.Size(), salt.Get(), (int) salt.Size(), iterationCount, key.Get(), (int) key.Size(), NULL);
+		return 0;
 	}
 
-	void Pkcs5HmacSha256::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
+	int Pkcs5HmacSha256::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
 	{
 		ValidateParameters (key, password, salt, iterationCount);
 		derive_key_sha256 (password.DataPtr(), (int) password.Size(), salt.Get(), (int) salt.Size(), iterationCount, key.Get(), (int) key.Size(), NULL);
+		return 0;
 	}
 
-	void Pkcs5HmacSha512::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
+	int Pkcs5HmacSha512::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
 	{
 		ValidateParameters (key, password, salt, iterationCount);
 		derive_key_sha512 (password.DataPtr(), (int) password.Size(), salt.Get(), (int) salt.Size(), iterationCount, key.Get(), (int) key.Size(), NULL);
+		return 0;
 	}
 
     #ifndef WOLFCRYPT_BACKEND
-	void Pkcs5HmacWhirlpool::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
+	int Pkcs5HmacWhirlpool::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
 	{
 		ValidateParameters (key, password, salt, iterationCount);
 		derive_key_whirlpool (password.DataPtr(), (int) password.Size(), salt.Get(), (int) salt.Size(), iterationCount, key.Get(), (int) key.Size(), NULL);
+		return 0;
 	}
 	
-	void Pkcs5HmacStreebog::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
+	int Pkcs5HmacStreebog::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
 	{
 		ValidateParameters (key, password, salt, iterationCount);
 		derive_key_streebog (password.DataPtr(), (int) password.Size(), salt.Get(), (int) salt.Size(), iterationCount, key.Get(), (int) key.Size(), NULL);
+		return 0;
 	}
+
+	#ifndef VC_DCS_DISABLE_ARGON2
+	int Pkcs5Argon2::DeriveKey (const BufferPtr &key, const VolumePassword &password, int pim, const ConstBufferPtr &salt) const
+	{
+		int iterationCount;
+		int memoryCost;
+		get_argon2_params (pim, &iterationCount, &memoryCost);
+
+		ValidateParameters (key, password, salt, iterationCount);
+		return derive_key_argon2 (password.DataPtr(), (int) password.Size(), salt.Get(), (int) salt.Size(), iterationCount, memoryCost, key.Get(), (int) key.Size(), NULL);
+	}
+
+	int Pkcs5Argon2::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
+	{
+		(void) key;
+		(void) password;
+		(void) salt;
+		(void) iterationCount;
+		throw ParameterIncorrect (SRC_POS);
+	}
+
+	wstring Pkcs5Argon2::GetDerivationFailureMessage (int result) const
+	{
+		return L"Argon2 key derivation failed: " + StringConverter::ToWide (argon2_error_message (result));
+	}
+
+	int Pkcs5Argon2::GetIterationCount (int pim) const
+	{
+		int iterationCount;
+		int memoryCost;
+		get_argon2_params (pim, &iterationCount, &memoryCost);
+		return iterationCount;
+	}
+	#endif
 	
-	void Pkcs5HmacStreebog_Boot::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
+	int Pkcs5HmacStreebog_Boot::DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const
 	{
 		ValidateParameters (key, password, salt, iterationCount);
 		derive_key_streebog (password.DataPtr(), (int) password.Size(), salt.Get(), (int) salt.Size(), iterationCount, key.Get(), (int) key.Size(), NULL);
+		return 0;
 	}
     #endif
 }

src/Volume/Pkcs5Kdf.h

@@ -27,15 +27,22 @@ namespace VeraCrypt
 	public:
 		virtual ~Pkcs5Kdf ();
 
-		virtual void DeriveKey (const BufferPtr &key, const VolumePassword &password, int pim, const ConstBufferPtr &salt) const;
-		virtual void DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const = 0;
+		virtual int DeriveKey (const BufferPtr &key, const VolumePassword &password, int pim, const ConstBufferPtr &salt) const;
+		virtual int DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const = 0;
 		static shared_ptr <Pkcs5Kdf> GetAlgorithm (const wstring &name);
 		static shared_ptr <Pkcs5Kdf> GetAlgorithm (const Hash &hash);
 		static Pkcs5KdfList GetAvailableAlgorithms ();
 		virtual shared_ptr <Hash> GetHash () const = 0;
+		virtual wstring GetDerivationFailureMessage (int result) const;
+		virtual int GetDefaultPim () const { return 485; }
+		virtual const char *GetPimHelpMessageId () const { return "PIM_HELP"; }
+		virtual const char *GetPimLargeWarningMessageId () const { return "PIM_LARGE_WARNING"; }
+		virtual const char *GetPimSmallWarningMessageId () const { return "PIM_SMALL_WARNING"; }
+		virtual const char *GetPimRequireLongPasswordMessageId () const { return "PIM_REQUIRE_LONG_PASSWORD"; }
 		virtual int GetIterationCount (int pim) const = 0;
 		virtual wstring GetName () const = 0;
 		virtual Pkcs5Kdf* Clone () const = 0;
+		virtual bool IsArgon2 () const { return false; }
 		virtual bool IsDeprecated () const { return GetHash()->IsDeprecated(); }
 
 	protected:
@@ -55,8 +62,9 @@ namespace VeraCrypt
 		Pkcs5HmacBlake2s_Boot () : Pkcs5Kdf() { }
 		virtual ~Pkcs5HmacBlake2s_Boot () { }
 
-		virtual void DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
+		virtual int DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
 		virtual shared_ptr <Hash> GetHash () const { return shared_ptr <Hash> (new Blake2s); }
+		virtual int GetDefaultPim () const { return 98; }
 		virtual int GetIterationCount (int pim) const { return pim <= 0 ? 200000 : (pim * 2048); }
 		virtual wstring GetName () const { return L"HMAC-BLAKE2s-256"; }
 		virtual Pkcs5Kdf* Clone () const { return new Pkcs5HmacBlake2s_Boot(); }
@@ -72,7 +80,7 @@ namespace VeraCrypt
 		Pkcs5HmacBlake2s () : Pkcs5Kdf() { }
 		virtual ~Pkcs5HmacBlake2s () { }
 
-		virtual void DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
+		virtual int DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
 		virtual shared_ptr <Hash> GetHash () const { return shared_ptr <Hash> (new Blake2s); }
 		virtual int GetIterationCount (int pim) const { return pim <= 0 ? 500000 : (15000 + (pim * 1000)); }
 		virtual wstring GetName () const { return L"HMAC-BLAKE2s-256"; }
@@ -90,8 +98,9 @@ namespace VeraCrypt
 		Pkcs5HmacSha256_Boot () : Pkcs5Kdf() { }
 		virtual ~Pkcs5HmacSha256_Boot () { }
 
-		virtual void DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
+		virtual int DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
 		virtual shared_ptr <Hash> GetHash () const { return shared_ptr <Hash> (new Sha256); }
+		virtual int GetDefaultPim () const { return 98; }
 		virtual int GetIterationCount (int pim) const { return pim <= 0 ? 200000 : (pim * 2048); }
 		virtual wstring GetName () const { return L"HMAC-SHA-256"; }
 		virtual Pkcs5Kdf* Clone () const { return new Pkcs5HmacSha256_Boot(); }
@@ -107,7 +116,7 @@ namespace VeraCrypt
 		Pkcs5HmacSha256 () : Pkcs5Kdf() { }
 		virtual ~Pkcs5HmacSha256 () { }
 
-		virtual void DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
+		virtual int DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
 		virtual shared_ptr <Hash> GetHash () const { return shared_ptr <Hash> (new Sha256); }
 		virtual int GetIterationCount (int pim) const { return pim <= 0 ? 500000 : (15000 + (pim * 1000)); }
 		virtual wstring GetName () const { return L"HMAC-SHA-256"; }
@@ -124,7 +133,7 @@ namespace VeraCrypt
 		Pkcs5HmacSha512 () : Pkcs5Kdf() { }
 		virtual ~Pkcs5HmacSha512 () { }
 
-		virtual void DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
+		virtual int DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
 		virtual shared_ptr <Hash> GetHash () const { return shared_ptr <Hash> (new Sha512); }
 		virtual int GetIterationCount (int pim) const { return (pim <= 0 ? 500000 : (15000 + (pim * 1000))); }
 		virtual wstring GetName () const { return L"HMAC-SHA-512"; }
@@ -141,7 +150,7 @@ namespace VeraCrypt
 		Pkcs5HmacWhirlpool () : Pkcs5Kdf() { }
 		virtual ~Pkcs5HmacWhirlpool () { }
 
-		virtual void DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
+		virtual int DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
 		virtual shared_ptr <Hash> GetHash () const { return shared_ptr <Hash> (new Whirlpool); }
 		virtual int GetIterationCount (int pim) const { return (pim <= 0 ? 500000 : (15000 + (pim * 1000))); }
 		virtual wstring GetName () const { return L"HMAC-Whirlpool"; }
@@ -158,7 +167,7 @@ namespace VeraCrypt
 		Pkcs5HmacStreebog () : Pkcs5Kdf() { }
 		virtual ~Pkcs5HmacStreebog () { }
 
-		virtual void DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
+		virtual int DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
 		virtual shared_ptr <Hash> GetHash () const { return shared_ptr <Hash> (new Streebog); }
 		virtual int GetIterationCount (int pim) const { return pim <= 0 ? 500000 : (15000 + (pim * 1000)); }
 		virtual wstring GetName () const { return L"HMAC-Streebog"; }
@@ -168,6 +177,33 @@ namespace VeraCrypt
 		Pkcs5HmacStreebog (const Pkcs5HmacStreebog &);
 		Pkcs5HmacStreebog &operator= (const Pkcs5HmacStreebog &);
 	};
+
+	#ifndef VC_DCS_DISABLE_ARGON2
+	class Pkcs5Argon2 : public Pkcs5Kdf
+	{
+	public:
+		Pkcs5Argon2 () : Pkcs5Kdf() { }
+		virtual ~Pkcs5Argon2 () { }
+
+		virtual int DeriveKey (const BufferPtr &key, const VolumePassword &password, int pim, const ConstBufferPtr &salt) const;
+		virtual int DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
+		virtual wstring GetDerivationFailureMessage (int result) const;
+		virtual shared_ptr <Hash> GetHash () const { return shared_ptr <Hash> (new Blake2b); }
+		virtual int GetDefaultPim () const { return 12; }
+		virtual const char *GetPimHelpMessageId () const { return "PIM_ARGON2_HELP"; }
+		virtual const char *GetPimLargeWarningMessageId () const { return "PIM_ARGON2_LARGE_WARNING"; }
+		virtual const char *GetPimSmallWarningMessageId () const { return "PIM_ARGON2_SMALL_WARNING"; }
+		virtual const char *GetPimRequireLongPasswordMessageId () const { return "PIM_ARGON2_REQUIRE_LONG_PASSWORD"; }
+		virtual int GetIterationCount (int pim) const;
+		virtual wstring GetName () const { return L"Argon2"; }
+		virtual Pkcs5Kdf* Clone () const { return new Pkcs5Argon2(); }
+		virtual bool IsArgon2 () const { return true; }
+
+	private:
+		Pkcs5Argon2 (const Pkcs5Argon2 &);
+		Pkcs5Argon2 &operator= (const Pkcs5Argon2 &);
+	};
+	#endif
 	
 	class Pkcs5HmacStreebog_Boot : public Pkcs5Kdf
 	{
@@ -175,8 +211,9 @@ namespace VeraCrypt
 		Pkcs5HmacStreebog_Boot () : Pkcs5Kdf() { }
 		virtual ~Pkcs5HmacStreebog_Boot () { }
 
-		virtual void DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
+		virtual int DeriveKey (const BufferPtr &key, const VolumePassword &password, const ConstBufferPtr &salt, int iterationCount) const;
 		virtual shared_ptr <Hash> GetHash () const { return shared_ptr <Hash> (new Streebog); }
+		virtual int GetDefaultPim () const { return 98; }
 		virtual int GetIterationCount (int pim) const { return pim <= 0 ? 200000 : pim * 2048; }
 		virtual wstring GetName () const { return L"HMAC-Streebog"; }
 		virtual Pkcs5Kdf* Clone () const { return new Pkcs5HmacStreebog_Boot(); }

src/Volume/VolumeHeader.cpp

@@ -107,7 +107,14 @@ namespace VeraCrypt
 			if (kdf && (kdf->GetName() != pkcs5->GetName()))
 				continue;
 
-			pkcs5->DeriveKey (headerKey, password, pim, salt);
+			int derivationResult = pkcs5->DeriveKey (headerKey, password, pim, salt);
+			if (derivationResult != 0)
+			{
+				if (!kdf)
+					continue;
+
+				throw ExternalException (SRC_POS, pkcs5->GetDerivationFailureMessage (derivationResult));
+			}
 
 			foreach (shared_ptr <EncryptionMode> mode, encryptionModes)
 			{

src/Volume/VolumePassword.cpp

@@ -18,6 +18,7 @@ namespace VeraCrypt
 {
 	const size_t VolumePassword::MaxLegacySize = 64;
 	const size_t VolumePassword::MaxSize = 128;
+	const size_t VolumePassword::SmallPimPasswordSizeThreshold = 20;
 	const size_t VolumePassword::WarningSizeThreshold = 12;
 		
 	VolumePassword::VolumePassword () : PasswordSize (0)

src/Volume/VolumePassword.h

@@ -43,6 +43,7 @@ namespace VeraCrypt
 
 		static const size_t MaxLegacySize;
 		static const size_t MaxSize;
+		static const size_t SmallPimPasswordSizeThreshold;
 		static const size_t WarningSizeThreshold;
 
 	protected: