diff options
author | Jakob Unterwurzacher | 2018-09-08 12:40:29 +0200 |
---|---|---|
committer | Jakob Unterwurzacher | 2018-09-08 12:40:29 +0200 |
commit | 2bdf7d5172d3540606f098030e8ede7a3ad1dfdd (patch) | |
tree | a32afb70805dbc0c4915d0b800016ea3f31214b0 /tests/cli | |
parent | 09d28c293e2f4142cda8dbfee0741aee7213748d (diff) |
configfile: add LoadAndDecrypt wrapper
Callers that do not want to decrypt the masterkey should
call plain Load().
https://github.com/rfjakob/gocryptfs/issues/258
Diffstat (limited to 'tests/cli')
-rw-r--r-- | tests/cli/cli_test.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/cli/cli_test.go b/tests/cli/cli_test.go index 3b53181..eaa92b6 100644 --- a/tests/cli/cli_test.go +++ b/tests/cli/cli_test.go @@ -34,7 +34,7 @@ func TestMain(m *testing.M) { // Test -init flag func TestInit(t *testing.T) { dir := test_helpers.InitFS(t) - _, c, err := configfile.Load(dir+"/"+configfile.ConfDefaultName, testPw) + _, c, err := configfile.LoadAndDecrypt(dir+"/"+configfile.ConfDefaultName, testPw) if err != nil { t.Fatal(err) } @@ -51,7 +51,7 @@ func TestInitDevRandom(t *testing.T) { // Test -init with -aessiv func TestInitAessiv(t *testing.T) { dir := test_helpers.InitFS(t, "-aessiv") - _, c, err := configfile.Load(dir+"/"+configfile.ConfDefaultName, testPw) + _, c, err := configfile.LoadAndDecrypt(dir+"/"+configfile.ConfDefaultName, testPw) if err != nil { t.Fatal(err) } @@ -63,7 +63,7 @@ func TestInitAessiv(t *testing.T) { // Test -init with -reverse func TestInitReverse(t *testing.T) { dir := test_helpers.InitFS(t, "-reverse") - _, c, err := configfile.Load(dir+"/"+configfile.ConfReverseName, testPw) + _, c, err := configfile.LoadAndDecrypt(dir+"/"+configfile.ConfReverseName, testPw) if err != nil { t.Fatal(err) } |