aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-19 00:11:24 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-19 00:11:24 +0200
commit494a546baf5d3681b4632db96eb42193986f972a (patch)
treebcc15620720343ca356430f9cf4c7ad6944d95c6
parent016194f41c6267e84f513e9895456f414651b3ad (diff)
bikeshadding
-rw-r--r--key/enc.go6
-rw-r--r--key/key.go6
2 files changed, 6 insertions, 6 deletions
diff --git a/key/enc.go b/key/enc.go
index f36192d..638e835 100644
--- a/key/enc.go
+++ b/key/enc.go
@@ -52,13 +52,13 @@ func (v *Enc) UnmarshalBinary(data []byte) error {
return unmarshal(data, v)
}
-func ParseEnc(data []byte, d KeyDeriver) (*Enc, error) {
+func ParseEnc(data []byte, der KeyDeriver) (*Enc, error) {
enc := new(Enc)
if err := enc.UnmarshalBinary(data); err != nil {
return nil, err
}
- if d != nil && enc.KDFRounds > 0 {
- xor, err := d.DeriveKey(enc.Salt[:], int(enc.KDFRounds), len(enc.Key))
+ if der != nil && enc.KDFRounds > 0 {
+ xor, err := der.DeriveKey(enc.Salt[:], int(enc.KDFRounds), len(enc.Key))
if err != nil {
return nil, err
}
diff --git a/key/key.go b/key/key.go
index 06746aa..1bb438b 100644
--- a/key/key.go
+++ b/key/key.go
@@ -31,7 +31,7 @@ type KeyDeriver interface {
DeriveKey(salt []byte, rounds int, length int) ([]byte, error)
}
-func NewKey(d KeyDeriver) (*Pub, *Enc, error) {
+func NewKey(der KeyDeriver) (*Pub, *Enc, error) {
pubKey, encKey, err := ed25519.GenerateKey(rand.Reader)
if err != nil {
return nil, nil, err
@@ -48,8 +48,8 @@ func NewKey(d KeyDeriver) (*Pub, *Enc, error) {
rand.Read(enc.KeyNum[:])
// Pbdkf
- if d != nil {
- xor, err := d.DeriveKey(enc.Salt[:], DefaultRounds, len(enc.Key))
+ if der != nil {
+ xor, err := der.DeriveKey(enc.Salt[:], DefaultRounds, len(enc.Key))
if err != nil {
return nil, nil, err
}