aboutsummaryrefslogtreecommitdiff
path: root/key/key.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-22 23:58:53 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-22 23:58:53 +0200
commit25e9c9f19f90aea367ae9831df1e7208e3f5f0b5 (patch)
treed21d2d8327861b0fbb48ba93f728cf51cb5d434c /key/key.go
parentab4919d1d12e130155d11743badd078fe79cf7aa (diff)
...
Diffstat (limited to 'key/key.go')
-rw-r--r--key/key.go10
1 files changed, 3 insertions, 7 deletions
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}