From 25e9c9f19f90aea367ae9831df1e7208e3f5f0b5 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sat, 22 Jul 2017 23:58:53 +0200 Subject: ... --- key/key.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'key/key.go') diff --git a/key/key.go b/key/key.go index aa2dd0e..585dc7a 100644 --- a/key/key.go +++ b/key/key.go @@ -55,15 +55,11 @@ func Generate(der Deriver) (*Pub, *Sec, error) { // Pbdkf if der != nil { - xor, err := der.Derive(sec.Salt[:], DefaultRounds, len(sec.Key)) - if err != nil { - return nil, nil, err - } - for i := range xor { - sec.Key[i] ^= xor[i] - } sec.KDFRounds = DefaultRounds } + if err := sec.Crypt(der); err != nil { + return nil, nil, err + } // public key pub := &Pub{PKAlg: pkAlg, KeyNum: sec.KeyNum} -- cgit v1.2.3