diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-06-24 18:42:33 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2015-06-24 23:58:52 +0200 |
| commit | d73df9bbd4e70f38a1f1ddc28e7bd45eb0edcc92 (patch) | |
| tree | edbd2ced249bdabbed9acb22c1b77c1d4b903652 /src | |
| parent | d734ce4635d468dffd67e7f86c9123df77e89bc4 (diff) | |
| download | VeraCrypt-d73df9bbd4e70f38a1f1ddc28e7bd45eb0edcc92.tar.gz VeraCrypt-d73df9bbd4e70f38a1f1ddc28e7bd45eb0edcc92.zip | |
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')
| -rw-r--r-- | src/Main/GraphicUserInterface.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp index d5413f37..014978a1 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 { |