diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-28 23:53:55 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-29 01:33:17 +0200 |
| commit | a0d8b8a3b78b1d0db50de2a7d841efaec2a55c36 (patch) | |
| tree | 749fb2a2fd5888145030b546666a41d28479bafa /src/Main | |
| parent | 3f806010d2e2d54f0b5bc796f2d5e506e66537c7 (diff) | |
| download | VeraCrypt-a0d8b8a3b78b1d0db50de2a7d841efaec2a55c36.tar.gz VeraCrypt-a0d8b8a3b78b1d0db50de2a7d841efaec2a55c36.zip | |
Linux/MacOSX: Implement passing smart card PIN as command line argument (--token-pin switch)
Diffstat (limited to 'src/Main')
| -rw-r--r-- | src/Main/CommandLineInterface.cpp | 6 | ||||
| -rw-r--r-- | src/Main/CommandLineInterface.h | 1 | ||||
| -rw-r--r-- | src/Main/GraphicUserInterface.cpp | 15 | ||||
| -rw-r--r-- | src/Main/TextUserInterface.cpp | 15 |
4 files changed, 37 insertions, 0 deletions
diff --git a/src/Main/CommandLineInterface.cpp b/src/Main/CommandLineInterface.cpp index 0a4f41b3..4d2f1387 100644 --- a/src/Main/CommandLineInterface.cpp +++ b/src/Main/CommandLineInterface.cpp @@ -89,6 +89,7 @@ namespace VeraCrypt parser.AddSwitch (L"", L"test", _("Test internal algorithms")); parser.AddSwitch (L"t", L"text", _("Use text user interface")); parser.AddOption (L"", L"token-lib", _("Security token library")); + parser.AddOption (L"", L"token-pin", _("Security token PIN")); parser.AddSwitch (L"v", L"verbose", _("Enable verbose output")); parser.AddSwitch (L"", L"version", _("Display version information")); parser.AddSwitch (L"", L"volume-properties", _("Display volume properties")); @@ -593,6 +594,11 @@ namespace VeraCrypt if (parser.Found (L"token-lib", &str)) Preferences.SecurityTokenModule = wstring (str); + if (parser.Found (L"token-pin", &str) && !str.IsEmpty ()) + { + ArgTokenPin = ToUTF8Buffer (str.c_str(), str.Len ()); + } + if (parser.Found (L"verbose")) Preferences.Verbose = true; diff --git a/src/Main/CommandLineInterface.h b/src/Main/CommandLineInterface.h index 9bca2614..d7a18818 100644 --- a/src/Main/CommandLineInterface.h +++ b/src/Main/CommandLineInterface.h @@ -82,6 +82,7 @@ namespace VeraCrypt VolumeInfoList ArgVolumes; VolumeType::Enum ArgVolumeType; bool ArgTrueCryptMode; + shared_ptr<SecureBuffer> ArgTokenPin; bool StartBackgroundTask; UserPreferences Preferences; diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp index d15e7375..b302b715 100644 --- a/src/Main/GraphicUserInterface.cpp +++ b/src/Main/GraphicUserInterface.cpp @@ -537,6 +537,13 @@ namespace VeraCrypt { virtual void operator() (string &passwordStr) { + if (CmdLine->ArgTokenPin && CmdLine->ArgTokenPin->IsAllocated ()) + { + passwordStr.clear(); + passwordStr.insert (0, (char*) CmdLine->ArgTokenPin->Ptr (), CmdLine->ArgTokenPin->Size()); + return; + } + if (Gui->GetPreferences().NonInteractive) throw MissingArgument (SRC_POS); @@ -563,6 +570,14 @@ namespace VeraCrypt StringConverter::ToSingle (wPassword, passwordStr); } + + virtual void notifyIncorrectPin () + { + if (CmdLine->ArgTokenPin && CmdLine->ArgTokenPin->IsAllocated ()) + { + CmdLine->ArgTokenPin->Free (); + } + } }; struct WarningHandler : public SendExceptionFunctor diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp index 902f4616..035e458e 100644 --- a/src/Main/TextUserInterface.cpp +++ b/src/Main/TextUserInterface.cpp @@ -1053,6 +1053,13 @@ namespace VeraCrypt virtual void operator() (string &passwordStr) { + if (CmdLine->ArgTokenPin && CmdLine->ArgTokenPin->IsAllocated ()) + { + passwordStr.clear(); + passwordStr.insert (0, (char*) CmdLine->ArgTokenPin->Ptr (), CmdLine->ArgTokenPin->Size()); + return; + } + if (UI->GetPreferences().NonInteractive) throw MissingArgument (SRC_POS); @@ -1069,6 +1076,14 @@ namespace VeraCrypt StringConverter::ToSingle (wPassword, passwordStr); } + virtual void notifyIncorrectPin () + { + if (CmdLine->ArgTokenPin && CmdLine->ArgTokenPin->IsAllocated ()) + { + CmdLine->ArgTokenPin->Free (); + } + } + const TextUserInterface *UI; }; |