From f6c49d3e907ce2ea1e1bfdebcc8e6d0160aecaa0 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Thu, 20 Jul 2017 00:49:51 +0200 Subject: Rename Enc to Sec --- key/key.go | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'key/key.go') diff --git a/key/key.go b/key/key.go index 738d065..f6490a2 100644 --- a/key/key.go +++ b/key/key.go @@ -34,43 +34,43 @@ type Deriver interface { } // Generate a new key pair -func Generate(der Deriver) (*Pub, *Enc, error) { - pubKey, encKey, err := ed25519.GenerateKey(rand.Reader) +func Generate(der Deriver) (*Pub, *Sec, error) { + pubKey, secKey, err := ed25519.GenerateKey(rand.Reader) if err != nil { return nil, nil, err } - // encoding key - enc := &Enc{PKAlg: pkAlg, KDFAlg: kdfAlg} - copy(enc.Key[:], encKey) + // secret key + sec := &Sec{PKAlg: pkAlg, KDFAlg: kdfAlg} + copy(sec.Key[:], secKey) - checkSum := sha512.Sum512(encKey) - copy(enc.Checksum[:], checkSum[:len(enc.Checksum)]) + checkSum := sha512.Sum512(secKey) + copy(sec.Checksum[:], checkSum[:len(sec.Checksum)]) - if _, err := rand.Read(enc.Salt[:]); err != nil { + if _, err := rand.Read(sec.Salt[:]); err != nil { return nil, nil, err } - if _, err := rand.Read(enc.KeyNum[:]); err != nil { + if _, err := rand.Read(sec.KeyNum[:]); err != nil { return nil, nil, err } // Pbdkf if der != nil { - xor, err := der.Derive(enc.Salt[:], DefaultRounds, len(enc.Key)) + xor, err := der.Derive(sec.Salt[:], DefaultRounds, len(sec.Key)) if err != nil { return nil, nil, err } for i := range xor { - enc.Key[i] ^= xor[i] + sec.Key[i] ^= xor[i] } - enc.KDFRounds = DefaultRounds + sec.KDFRounds = DefaultRounds } // public key - pub := &Pub{PKAlg: pkAlg, KeyNum: enc.KeyNum} + pub := &Pub{PKAlg: pkAlg, KeyNum: sec.KeyNum} copy(pub.Key[:], pubKey) - return pub, enc, nil + return pub, sec, nil } func unmarshal(data []byte, v interface{}) error { -- cgit v1.2.3