aboutsummaryrefslogtreecommitdiff
path: root/key/key.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-19 00:56:21 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-19 00:56:21 +0200
commitccb10d4fd0eec1437901ec143df646f405ec6073 (patch)
treecb222b7a8a29f9f5dce7221afbe0e528dd50b4a3 /key/key.go
parent192414f67f722599467ab621c7348e41574fd759 (diff)
...
Diffstat (limited to 'key/key.go')
-rw-r--r--key/key.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/key/key.go b/key/key.go
index bddd6ac..738d065 100644
--- a/key/key.go
+++ b/key/key.go
@@ -28,13 +28,13 @@ var (
kdfAlg = [2]byte{'B', 'K'}
)
-// KeyDeriver returns a derived key from passphrase
-type KeyDeriver interface {
- DeriveKey(salt []byte, rounds int, length int) ([]byte, error)
+// Deriver returns a derived key from passphrase
+type Deriver interface {
+ Derive(salt []byte, rounds int, length int) ([]byte, error)
}
// Generate a new key pair
-func Generate(der KeyDeriver) (*Pub, *Enc, error) {
+func Generate(der Deriver) (*Pub, *Enc, error) {
pubKey, encKey, err := ed25519.GenerateKey(rand.Reader)
if err != nil {
return nil, nil, err
@@ -48,15 +48,15 @@ func Generate(der KeyDeriver) (*Pub, *Enc, error) {
copy(enc.Checksum[:], checkSum[:len(enc.Checksum)])
if _, err := rand.Read(enc.Salt[:]); err != nil {
- return err
+ return nil, nil, err
}
if _, err := rand.Read(enc.KeyNum[:]); err != nil {
- return err
+ return nil, nil, err
}
// Pbdkf
if der != nil {
- xor, err := der.DeriveKey(enc.Salt[:], DefaultRounds, len(enc.Key))
+ xor, err := der.Derive(enc.Salt[:], DefaultRounds, len(enc.Key))
if err != nil {
return nil, nil, err
}