aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-05-01 20:08:56 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-05-01 20:08:56 +0200
commit38818083430d9c7b139bde722291b9cd4dd8daa6 (patch)
tree1ac78050e4cf8bb96007db0b795b1f03d9ca8824
parent9a8e71812e5ac450abbf05a9f1222f6deada65ab (diff)
Uniform names
-rw-r--r--file/file.go2
-rw-r--r--main.go2
-rw-r--r--signify/keys.go6
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()
}