diff options
| author | Jakob Unterwurzacher | 2018-12-15 17:09:38 +0100 |
|---|---|---|
| committer | Jakob Unterwurzacher | 2018-12-15 17:09:38 +0100 |
| commit | 295d432175292dbaef572093d784aab55f5c0b8f (patch) | |
| tree | d5db468806d211d0ea5bbd589dad3a0a337de714 /init_dir.go | |
| parent | b29ee62749244d1985a71f8df37a1582d9e790c9 (diff) | |
passfile: directly read file instead of invoking cat
Allows better error handling, gets rid of the call to an
external program, and fixes https://github.com/rfjakob/gocryptfs/issues/278 .
Diffstat (limited to 'init_dir.go')
| -rw-r--r-- | init_dir.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init_dir.go b/init_dir.go index 6bc977f..5d5cbc9 100644 --- a/init_dir.go +++ b/init_dir.go @@ -78,7 +78,7 @@ func initDir(args *argContainer) { password = readpassword.Trezor(trezorPayload) } else { // Normal password entry - password = readpassword.Twice(args.extpass) + password = readpassword.Twice(args.extpass, args.passfile) readpassword.CheckTrailingGarbage() } creator := tlog.ProgramName + " " + GitVersion |