Linux: if a keyfile is specified in the command line without a password, don't try to mount using an empty password unless its TrueCryptMode or an empty password has been explicitly specified.

This commit is contained in:
Mounir IDRASSI 2015-06-24 18:42:33 +02:00
parent d734ce4635
commit d73df9bbd4

View File

@ -728,7 +728,7 @@ namespace VeraCrypt
options.Keyfiles = make_shared <KeyfileList> (GetPreferences().DefaultKeyfiles); options.Keyfiles = make_shared <KeyfileList> (GetPreferences().DefaultKeyfiles);
if ((options.Password && !options.Password->IsEmpty()) if ((options.Password && !options.Password->IsEmpty())
|| (options.Keyfiles && !options.Keyfiles->empty())) || (options.Keyfiles && !options.Keyfiles->empty() && (options.TrueCryptMode || options.Password)))
{ {
try try
{ {