aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-18 20:38:09 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-18 20:38:09 +0200
commitd5254d6cf757c2a5d04e11f88295c85d68434f1d (patch)
treed70a22ebb298e86a40ef87ff364bf67fb7761b1b
parentc052aafa7d2d590530ca798aeebfb89b59beb491 (diff)
Rename Check to Err
-rw-r--r--key/enc.go4
-rw-r--r--key/key_test.go19
-rw-r--r--key/pub.go4
-rw-r--r--key/sig.go4
4 files changed, 16 insertions, 15 deletions
diff --git a/key/enc.go b/key/enc.go
index 6f9b0ff..b9286c5 100644
--- a/key/enc.go
+++ b/key/enc.go
@@ -23,7 +23,7 @@ func (v *Enc) Sign(message []byte) *Sig {
return sig
}
-func (v *Enc) Check() error {
+func (v *Enc) Err() error {
if v.PKAlg != pkAlg {
return ErrInvalidPK
}
@@ -59,5 +59,5 @@ func ParseEnc(data []byte, d KeyDeriver) (*Enc, error) {
enc.Key[i] ^= xor[i]
}
}
- return enc, enc.Check()
+ return enc, enc.Err()
}
diff --git a/key/key_test.go b/key/key_test.go
index 851b615..97b37af 100644
--- a/key/key_test.go
+++ b/key/key_test.go
@@ -6,29 +6,30 @@ import (
"testing"
)
-type Checker interface {
- Check() error
+type Interface interface {
+ UnmarshalBinary([]byte) error
+ Err() error
}
func TestKeys(t *testing.T) {
var testCases = []struct {
caption string
- checker Checker
+ key Interface
rawValue string
}{
{
caption: "sig",
- checker: new(Sig),
+ key: new(Sig),
rawValue: "RWRbOC0bBf7abaGwGtq45KLDK63tgcF7CO4qTZSlTKCSbZTYlDfFm/DISQ60u+/jEzrk22suvXXAEsxQTe2xUOfV90get1YRGQo=",
},
{
caption: "pub",
- checker: new(Pub),
+ key: new(Pub),
rawValue: "RWRbOC0bBf7abfanaXuTYfCa6+YO69Kxyz8RD5nL/3Ta7umY6iOwnBrG",
},
{
caption: "enc",
- checker: new(Enc),
+ key: new(Enc),
rawValue: "RWRCSwAAAACzJBN2gC5//jVvDiV76rs4m2aKXkljqDpbOC0bBf7abZhV/Zygr6b0KIbSI56JQutwzsQeouxnnHuVTZp3IW4M9qdpe5Nh8Jrr5g7r0rHLPxEPmcv/dNru6ZjqI7CcGsY=",
},
}
@@ -38,13 +39,13 @@ func TestKeys(t *testing.T) {
if err != nil {
t.Fatal(err)
}
- if err := Unmarshal(raw, tc.checker); err != nil {
+ if err := tc.key.UnmarshalBinary(raw); err != nil {
t.Fatal(err)
}
- if err := tc.checker.Check(); err != nil {
+ if err := tc.key.Err(); err != nil {
t.Fatal(err)
}
- out, err := Marshal(tc.checker)
+ out, err := Marshal(tc.key)
if err != nil {
t.Fatal(err)
}
diff --git a/key/pub.go b/key/pub.go
index 2f1d358..c1eb388 100644
--- a/key/pub.go
+++ b/key/pub.go
@@ -8,7 +8,7 @@ type Pub struct {
Key [ed25519.PublicKeySize]byte
}
-func (v *Pub) Check() error {
+func (v *Pub) Err() error {
if v.PKAlg != pkAlg {
return ErrInvalidPK
}
@@ -38,5 +38,5 @@ func ParsePub(data []byte) (*Pub, error) {
if err := pub.UnmarshalBinary(data); err != nil {
return nil, err
}
- return pub, pub.Check()
+ return pub, pub.Err()
}
diff --git a/key/sig.go b/key/sig.go
index c6f1beb..6b35e1e 100644
--- a/key/sig.go
+++ b/key/sig.go
@@ -8,7 +8,7 @@ type Sig struct {
Sig [ed25519.SignatureSize]byte
}
-func (v *Sig) Check() error {
+func (v *Sig) Err() error {
if v.PKAlg != pkAlg {
return ErrInvalidPK
}
@@ -28,5 +28,5 @@ func ParseSig(data []byte) (*Sig, error) {
if err := sig.UnmarshalBinary(data); err != nil {
return nil, err
}
- return sig, sig.Check()
+ return sig, sig.Err()
}