VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-06-24 16:42:33 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-06-24 21:58:52 (GMT)
commitd73df9bbd4e70f38a1f1ddc28e7bd45eb0edcc92 (patch)
treeedbd2ced249bdabbed9acb22c1b77c1d4b903652 /src/Main
parentd734ce4635d468dffd67e7f86c9123df77e89bc4 (diff)
downloadVeraCrypt-d73df9bbd4e70f38a1f1ddc28e7bd45eb0edcc92.zip
VeraCrypt-d73df9bbd4e70f38a1f1ddc28e7bd45eb0edcc92.tar.gz
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.
Diffstat (limited to 'src/Main')
-rw-r--r--src/Main/GraphicUserInterface.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp
index d5413f3..014978a 100644
--- a/src/Main/GraphicUserInterface.cpp
+++ b/src/Main/GraphicUserInterface.cpp
@@ -728,7 +728,7 @@ namespace VeraCrypt
options.Keyfiles = make_shared <KeyfileList> (GetPreferences().DefaultKeyfiles);
if ((options.Password && !options.Password->IsEmpty())
- || (options.Keyfiles && !options.Keyfiles->empty()))
+ || (options.Keyfiles && !options.Keyfiles->empty() && (options.TrueCryptMode || options.Password)))
{
try
{