From 016194f41c6267e84f513e9895456f414651b3ad Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 19 Jul 2017 00:10:12 +0200 Subject: Add Public method --- key/key.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'key/key.go') diff --git a/key/key.go b/key/key.go index 32aa2e8..06746aa 100644 --- a/key/key.go +++ b/key/key.go @@ -37,10 +37,8 @@ func NewKey(d KeyDeriver) (*Pub, *Enc, error) { return nil, nil, err } - pub := &Pub{PKAlg: pkAlg} + // encoding key enc := &Enc{PKAlg: pkAlg, KDFAlg: kdfAlg} - - copy(pub.Key[:], pubKey) copy(enc.Key[:], encKey) checkSum := sha512.Sum512(encKey) @@ -48,8 +46,8 @@ func NewKey(d KeyDeriver) (*Pub, *Enc, error) { rand.Read(enc.Salt[:]) rand.Read(enc.KeyNum[:]) - pub.KeyNum = enc.KeyNum + // Pbdkf if d != nil { xor, err := d.DeriveKey(enc.Salt[:], DefaultRounds, len(enc.Key)) if err != nil { @@ -61,6 +59,10 @@ func NewKey(d KeyDeriver) (*Pub, *Enc, error) { enc.KDFRounds = DefaultRounds } + // public key + pub := &Pub{PKAlg: pkAlg, KeyNum: enc.KeyNum} + copy(pub.Key[:], pubKey) + return pub, enc, nil } -- cgit v1.2.3