From 991adfc934d714897e3c0ad39d37fca3edf59bcb Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Mon, 13 May 2019 23:01:44 +0200
Subject: -passwd now takes a passed -scryptn flag into account

https://github.com/rfjakob/gocryptfs/issues/400
---
 main.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'main.go')

diff --git a/main.go b/main.go
index 40fd8ac..b96ebf0 100644
--- a/main.go
+++ b/main.go
@@ -94,7 +94,11 @@ func changePassword(args *argContainer) {
 		}
 		tlog.Info.Println("Please enter your new password.")
 		newPw := readpassword.Twice([]string(args.extpass), args.passfile)
-		confFile.EncryptKey(masterkey, newPw, confFile.ScryptObject.LogN())
+		logN := confFile.ScryptObject.LogN()
+		if args._explicitScryptn {
+			logN = args.scryptn
+		}
+		confFile.EncryptKey(masterkey, newPw, logN)
 		for i := range newPw {
 			newPw[i] = 0
 		}
-- 
cgit v1.2.3