From d73df9bbd4e70f38a1f1ddc28e7bd45eb0edcc92 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Wed, 24 Jun 2015 18:42:33 +0200 Subject: 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. --- src/Main/GraphicUserInterface.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Main/GraphicUserInterface.cpp') 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 (GetPreferences().DefaultKeyfiles); if ((options.Password && !options.Password->IsEmpty()) - || (options.Keyfiles && !options.Keyfiles->empty())) + || (options.Keyfiles && !options.Keyfiles->empty() && (options.TrueCryptMode || options.Password))) { try { -- cgit v1.2.3