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
---
 tests/trezor/trezor_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tests/trezor')

diff --git a/tests/trezor/trezor_test.go b/tests/trezor/trezor_test.go
index 59e10cb..5e071fc 100644
--- a/tests/trezor/trezor_test.go
+++ b/tests/trezor/trezor_test.go
@@ -35,7 +35,7 @@ func TestInitTrezor(t *testing.T) {
 	//                                        vvvvvvvvvvvvv disable -extpass
 	dir := test_helpers.InitFS(t, "-trezor", "-extpass", "")
 	// The freshly created config file should have the Trezor feature flag set.
-	_, c, err := configfile.Load(dir+"/"+configfile.ConfDefaultName, nil)
+	c, err := configfile.Load(dir + "/" + configfile.ConfDefaultName)
 	if err != nil {
 		t.Fatal(err)
 	}
-- 
cgit v1.2.3