diff options
author | Jakob Unterwurzacher | 2018-03-22 00:02:10 +0100 |
---|---|---|
committer | Jakob Unterwurzacher | 2018-03-22 00:02:10 +0100 |
commit | 9bc039a4bac6b51d9ebe116de5c311e90343a088 (patch) | |
tree | f4ebd37e2cbe4088435421fb7c9550c186161b09 /main.go | |
parent | 9c86daf499dca8a69b058ec56803d06fbba4fdab (diff) |
Add `-masterkey=stdin` functionality
https://github.com/rfjakob/gocryptfs/issues/218
Diffstat (limited to 'main.go')
-rw-r--r-- | main.go | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -43,10 +43,10 @@ func loadConfig(args *argContainer) (masterkey []byte, confFile *configfile.Conf // The user has passed the master key (probably because he forgot the // password). if args.masterkey != "" { - masterkey = parseMasterKey(args.masterkey) + masterkey = parseMasterKey(args.masterkey, false) _, confFile, err = configfile.LoadConfFile(args.config, nil) } else { - pw := readpassword.Once(args.extpass) + pw := readpassword.Once(args.extpass, "") tlog.Info.Println("Decrypting master key") masterkey, confFile, err = configfile.LoadConfFile(args.config, pw) for i := range pw { |