From 894e41ee7aae0b9a9b8e3e35027c3e2e07096d96 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 14 Apr 2017 23:49:29 +0200 Subject: deadcode --- keys.go | 13 ++++++++++--- main_test.go | 16 ---------------- 2 files changed, 10 insertions(+), 19 deletions(-) delete mode 100644 main_test.go diff --git a/keys.go b/keys.go index f12c6f0..5e6e73f 100644 --- a/keys.go +++ b/keys.go @@ -38,12 +38,19 @@ type EncKey struct { SecKey [ed25519.PrivateKeySize]byte } +func (v *EncKey) XOR(key []byte) { + if len(key) != len(v.SecKey) { + panic("invalid key len") + } + for i := range key { + v.SecKey[i] ^= key[i] + } +} + func (v *EncKey) IsValid(pass []byte) bool { if v.KDFRounds > 0 { key := bhash.Pbkdf(pass, v.Salt[:], int(v.KDFRounds), len(v.SecKey)) - for x := range key { - v.SecKey[x] ^= key[x] - } + v.XOR(key) } sum := sha512.Sum512(v.SecKey[:]) return bytes.Equal(sum[:len(v.Checksum)], v.Checksum[:]) diff --git a/main_test.go b/main_test.go deleted file mode 100644 index 1ea7dc7..0000000 --- a/main_test.go +++ /dev/null @@ -1,16 +0,0 @@ -package main - -import ( - "testing" - - "golang.org/x/crypto/bcrypt" -) - -func TestBcrypt(t *testing.T) { - pw := "test" - ret, err := bcrypt.GenerateFromPassword([]byte(pw), 10) - if err != nil { - t.Error(err) - } - t.Log(ret) -} -- cgit v1.2.3