From 416080203b4dd79de857eaf7c7cc97d050e00a9f Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sun, 17 May 2020 19:31:04 +0200
Subject: main: accept multiple -passfile options

Each file will be read and then concatenated
for the effictive password. This can be used as a
kind of multi-factor authenticiton.

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

(limited to 'main.go')

diff --git a/main.go b/main.go
index de627cb..11e15b2 100644
--- a/main.go
+++ b/main.go
@@ -50,7 +50,7 @@ func loadConfig(args *argContainer) (masterkey []byte, cf *configfile.ConfFile,
 	if masterkey != nil {
 		return masterkey, cf, nil
 	}
-	pw := readpassword.Once([]string(args.extpass), args.passfile, "")
+	pw := readpassword.Once([]string(args.extpass), []string(args.passfile), "")
 	tlog.Info.Println("Decrypting master key")
 	masterkey, err = cf.DecryptMasterKey(pw)
 	for i := range pw {
@@ -79,7 +79,7 @@ func changePassword(args *argContainer) {
 			log.Panic("empty masterkey")
 		}
 		tlog.Info.Println("Please enter your new password.")
-		newPw := readpassword.Twice([]string(args.extpass), args.passfile)
+		newPw := readpassword.Twice([]string(args.extpass), []string(args.passfile))
 		logN := confFile.ScryptObject.LogN()
 		if args._explicitScryptn {
 			logN = args.scryptn
-- 
cgit v1.2.3