aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--keys.go15
-rw-r--r--main.go6
2 files changed, 10 insertions, 11 deletions
diff --git a/keys.go b/keys.go
index d96d999..bfa64b6 100644
--- a/keys.go
+++ b/keys.go
@@ -4,28 +4,33 @@ import (
"bytes"
"crypto/sha512"
- "github.com/agl/ed25519"
+ "golang.org/x/crypto/ed25519"
+)
+
+var (
+ PKAlg = [2]byte{'E', 'd'}
+ KDFAlg = [2]byte{'B', 'K'}
)
type Sig struct {
PKAlg [2]byte
- KeyNum [KeyNumLen]byte
+ KeyNum [8]byte
Sig [ed25519.SignatureSize]byte
}
type PubKey struct {
PKAlg [2]byte
- KeyNum [KeyNumLen]byte
+ KeyNum [8]byte
PubKey [ed25519.PublicKeySize]byte
}
type EncKey struct {
PKAlg [2]byte
KDFAlg [2]byte
- KDFRounds uint32 // network byte order
+ KDFRounds uint32
Salt [16]byte
Checksum [8]byte
- KeyNum [KeyNumLen]byte
+ KeyNum [8]byte
SecKey [ed25519.PrivateKeySize]byte
}
diff --git a/main.go b/main.go
index 842d6dc..8d01333 100644
--- a/main.go
+++ b/main.go
@@ -7,15 +7,9 @@ import (
"fmt"
)
-var (
- PKAlg = [2]byte{'E', 'd'}
- KDFAlg = [2]byte{'B', 'K'}
-)
-
const (
verFailed = "signature verfication failed"
verOK = "Signature Verfied"
- KeyNumLen = 8
DefaultRounds = 42
)