From 2bdf7d5172d3540606f098030e8ede7a3ad1dfdd Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sat, 8 Sep 2018 12:40:29 +0200
Subject: configfile: add LoadAndDecrypt wrapper

Callers that do not want to decrypt the masterkey should
call plain Load().

https://github.com/rfjakob/gocryptfs/issues/258
---
 gocryptfs-xray/xray_main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gocryptfs-xray')

diff --git a/gocryptfs-xray/xray_main.go b/gocryptfs-xray/xray_main.go
index 551b51b..569776d 100644
--- a/gocryptfs-xray/xray_main.go
+++ b/gocryptfs-xray/xray_main.go
@@ -61,7 +61,7 @@ func main() {
 func dumpMasterKey(fn string) {
 	tlog.Info.Enabled = false
 	pw := readpassword.Once("", "")
-	masterkey, _, err := configfile.Load(fn, pw)
+	masterkey, _, err := configfile.LoadAndDecrypt(fn, pw)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		exitcodes.Exit(err)
-- 
cgit v1.2.3