From 9bc039a4bac6b51d9ebe116de5c311e90343a088 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Thu, 22 Mar 2018 00:02:10 +0100
Subject: Add `-masterkey=stdin` functionality

https://github.com/rfjakob/gocryptfs/issues/218
---
 main.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'main.go')

diff --git a/main.go b/main.go
index 1e1de11..8f857bc 100644
--- a/main.go
+++ b/main.go
@@ -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 {
-- 
cgit v1.2.3