From 38818083430d9c7b139bde722291b9cd4dd8daa6 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 1 May 2017 20:08:56 +0200 Subject: Uniform names --- file/file.go | 2 +- main.go | 2 +- signify/keys.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/file/file.go b/file/file.go index 8082c74..a63c316 100644 --- a/file/file.go +++ b/file/file.go @@ -78,7 +78,7 @@ func DecodeFile(fname string) (*Block, error) { } const ( - SecMode os.FileMode = 0600 + EncMode os.FileMode = 0600 PubMode os.FileMode = 0644 SigMode os.FileMode = 0644 ) diff --git a/main.go b/main.go index f969841..e73c4f4 100644 --- a/main.go +++ b/main.go @@ -81,7 +81,7 @@ func Generate(pubFile, encFile, comment string, nopass bool) error { Comment: fmt.Sprintf("%s secret key", comment), Bytes: encRaw, } - if err := file.EncodeFile(encFile, file.SecMode, sfile); err != nil { + if err := file.EncodeFile(encFile, file.EncMode, sfile); err != nil { return err } diff --git a/signify/keys.go b/signify/keys.go index 910a727..07521ea 100644 --- a/signify/keys.go +++ b/signify/keys.go @@ -102,9 +102,9 @@ func (e *Enc) Kdf(ask func() (string, error)) error { if err != nil { return err } - xorkey := bhash.Pbkdf([]byte(pass), e.Salt[:], int(e.KDFRounds), len(e.Key)) - for i := range xorkey { - e.Key[i] ^= xorkey[i] + xor := bhash.Pbkdf([]byte(pass), e.Salt[:], int(e.KDFRounds), len(e.Key)) + for i := range xor { + e.Key[i] ^= xor[i] } return e.Check() } -- cgit v1.2.3