nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-28 05:53:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linux/OSX: make CLI switch --import-token-keyfiles compatible with Non-Interactive

Browse Source 
mode by using keyfiles passed as arguments and check the Non-Interactive
mode switch.
This commit is contained in:
Mounir IDRASSI 2019-09-24 22:04:23 +02:00
parent 89a8b0c262
commit c8beacbdd7
No known key found for this signature in database
GPG Key ID: 02C30AE90FAE4A6F
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Main/TextUserInterface.cpp
View File

@ -1056,9 +1056,18 @@ namespace VeraCrypt
slotId = (CK_SLOT_ID) AskSelection (tokens.back().SlotId, tokens.front().SlotId); slotId = (CK_SLOT_ID) AskSelection (tokens.back().SlotId, tokens.front().SlotId);
} }
shared_ptr <KeyfileList> keyfiles = AskKeyfiles(); shared_ptr <KeyfileList> keyfiles;
if (keyfiles->empty())
throw UserAbort(); if (CmdLine->ArgKeyfiles.get() && !CmdLine->ArgKeyfiles->empty())
keyfiles = CmdLine->ArgKeyfiles;
else if (!Preferences.NonInteractive)
{
keyfiles = AskKeyfiles();
if (keyfiles->empty())
throw UserAbort();
}
else
throw MissingArgument (SRC_POS);
foreach_ref (const Keyfile &keyfilePath, *keyfiles) foreach_ref (const Keyfile &keyfilePath, *keyfiles)
{ {