From 5ded3eaa1f1b50da4758cb1c1d9b668e4f7c1719 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 24 Apr 2017 11:10:23 +0200 Subject: ... --- keys.go | 2 +- keys_test.go | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/keys.go b/keys.go index f299a64..b489385 100644 --- a/keys.go +++ b/keys.go @@ -106,7 +106,7 @@ func (e *EncKey) Kdf(ask func() (string, error)) error { for i := range xorkey { e.SecKey[i] ^= xorkey[i] } - return nil + return e.Check() } func Unmarshal(b []byte, v interface{}) error { diff --git a/keys_test.go b/keys_test.go index 675ceee..4788f90 100644 --- a/keys_test.go +++ b/keys_test.go @@ -47,12 +47,12 @@ func TestUnmarshalEnc(t *testing.T) { if !bytes.Equal(raw, out) { t.Errorf("want %v, got %v", raw, out) } - if err := v.Check(); err != nil { + if err := v.Kdf(func() (string, error) { return "", nil }); err != nil { t.Error(err) } } -func TestUnmarshalKDF(t *testing.T) { +func TestUnmarshalEncKDF(t *testing.T) { raw, err := decode("RWRCSwAAACoXv4r2lp3RYYLEWZRsY+1Z+1mJtEScNBaKdOKcMdhUHrztnf8a4sUNGY19MoV3wX2cyW2Mn1MduKxi9s3Se070TGF0IZG/hH4SKiNUYi+yi1mandWAwmhY3ahIHApigTk=") if err != nil { t.Fatal(err) @@ -63,8 +63,7 @@ func TestUnmarshalKDF(t *testing.T) { if !bytes.Equal(raw, out) { t.Errorf("want %v, got %v", raw, out) } - v.Kdf(func() (string, error) { return "test", nil }) - if err := v.Check(); err != nil { + if err := v.Kdf(func() (string, error) { return "test", nil }); err != nil { t.Error(err) } } -- cgit v1.2.3