summaryrefslogtreecommitdiff
path: root/masterkey.go
diff options
context:
space:
mode:
authorJakob Unterwurzacher2019-04-08 20:18:45 +0200
committerJakob Unterwurzacher2019-04-08 20:18:45 +0200
commitfe06e9f45646893dc88ebe9e657e2e991f6f5fbb (patch)
treead5d8e2910ed71a5c579e40f897093bec2e19011 /masterkey.go
parent8459bb15c1a32561c250a8b688ab4a7ecda0a4aa (diff)
readpassword: delete CheckTrailingGarbage
CheckTrailingGarbage was called even when "-passfile" was used, which is stupid, and causes false positives: https://github.com/rfjakob/gocryptfs/issues/391 (false error "Received trailing garbage after the password" when using -passfile in .bash_profile) Instead of trying to improve the logic to handle that case and make everything even more complicated, delete the function. It is unclear if actually helps in some cases, and it definitely harms as shown by the above bug report.
Diffstat (limited to 'masterkey.go')
-rw-r--r--masterkey.go3
1 files changed, 0 insertions, 3 deletions
diff --git a/masterkey.go b/masterkey.go
index 8392bc6..706eb68 100644
--- a/masterkey.go
+++ b/masterkey.go
@@ -69,8 +69,5 @@ func getMasterKey(args *argContainer) (masterkey []byte, confFile *configfile.Co
}
exitcodes.Exit(err)
}
- if !args.trezor {
- readpassword.CheckTrailingGarbage()
- }
return masterkey, confFile
}