aboutsummaryrefslogtreecommitdiff
path: root/key/key.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-20 00:49:51 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-20 00:49:51 +0200
commitf6c49d3e907ce2ea1e1bfdebcc8e6d0160aecaa0 (patch)
treef60c6e4181a2ef8ba039546857468640323b011d /key/key.go
parent7d81c334c35b33f853edd7a7909e749ef277ae38 (diff)
Rename Enc to Sec
Diffstat (limited to 'key/key.go')
-rw-r--r--key/key.go28
1 files changed, 14 insertions, 14 deletions
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 {