aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-19 11:47:18 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-19 11:47:18 +0200
commit1f0d57dfa1ab911fc57c066de9aa7d931310f764 (patch)
tree2a8b40e80279ab783bb73884fc297650ee7280e1
parentccb10d4fd0eec1437901ec143df646f405ec6073 (diff)
...
-rw-r--r--file/names.go2
-rw-r--r--file/names_test.go2
-rw-r--r--generate.go2
-rw-r--r--key/enc.go4
-rw-r--r--key/key_test.go4
-rw-r--r--key/pub.go4
-rw-r--r--key/sig.go4
7 files changed, 11 insertions, 11 deletions
diff --git a/file/names.go b/file/names.go
index 1ef1246..8ed4a36 100644
--- a/file/names.go
+++ b/file/names.go
@@ -23,7 +23,7 @@ func splitNameExt(fname string) (string, string) {
return file[:len(file)-len(ext)], ext
}
-func CheckNames(pubFile, encFile string) error {
+func ValidateNames(pubFile, encFile string) error {
pubName, pubExt := splitNameExt(pubFile)
encName, encExt := splitNameExt(encFile)
if pubExt != extPub || encExt != extEnc || pubName != encName {
diff --git a/file/names_test.go b/file/names_test.go
index b6a28c0..7f6e089 100644
--- a/file/names_test.go
+++ b/file/names_test.go
@@ -15,7 +15,7 @@ func TestCheckNames(t *testing.T) {
}
for _, tc := range testCases {
t.Run(tc.pub+"+"+tc.sec, func(t *testing.T) {
- err := CheckNames(tc.pub, tc.sec)
+ err := ValidateNames(tc.pub, tc.sec)
if err != tc.err {
t.Errorf("got %v, want %v", err, tc.err)
}
diff --git a/generate.go b/generate.go
index cf786eb..3ad9f8e 100644
--- a/generate.go
+++ b/generate.go
@@ -25,7 +25,7 @@ func generate(args []string) error {
opts.Usage()
return nil
}
- if err := file.CheckNames(*pubFile, *encFile); err != nil {
+ if err := file.ValidateNames(*pubFile, *encFile); err != nil {
return err
}
diff --git a/key/enc.go b/key/enc.go
index 6013ab7..aa65df3 100644
--- a/key/enc.go
+++ b/key/enc.go
@@ -24,7 +24,7 @@ func (v *Enc) Sign(message []byte) *Sig {
return sig
}
-func (v *Enc) Err() error {
+func (v *Enc) Validate() error {
if v.PKAlg != pkAlg {
return ErrInvalidPK
}
@@ -64,5 +64,5 @@ func NewEnc(data []byte, der Deriver) (*Enc, error) {
enc.Key[i] ^= xor[i]
}
}
- return enc, enc.Err()
+ return enc, enc.Validate()
}
diff --git a/key/key_test.go b/key/key_test.go
index 6007cf0..0513464 100644
--- a/key/key_test.go
+++ b/key/key_test.go
@@ -10,7 +10,7 @@ import (
type Interface interface {
encoding.BinaryUnmarshaler
encoding.BinaryMarshaler
- Err() error
+ Validate() error
}
func TestKeys(t *testing.T) {
@@ -44,7 +44,7 @@ func TestKeys(t *testing.T) {
if err := tc.key.UnmarshalBinary(raw); err != nil {
t.Fatal(err)
}
- if err := tc.key.Err(); err != nil {
+ if err := tc.key.Validate(); err != nil {
t.Fatal(err)
}
out, err := tc.key.MarshalBinary()
diff --git a/key/pub.go b/key/pub.go
index 7767531..f676226 100644
--- a/key/pub.go
+++ b/key/pub.go
@@ -8,7 +8,7 @@ type Pub struct {
Key [ed25519.PublicKeySize]byte
}
-func (v *Pub) Err() error {
+func (v *Pub) Validate() error {
if v.PKAlg != pkAlg {
return ErrInvalidPK
}
@@ -24,5 +24,5 @@ func NewPub(data []byte) (*Pub, error) {
if err := pub.UnmarshalBinary(data); err != nil {
return nil, err
}
- return pub, pub.Err()
+ return pub, pub.Validate()
}
diff --git a/key/sig.go b/key/sig.go
index 59c2c44..130fbbe 100644
--- a/key/sig.go
+++ b/key/sig.go
@@ -8,7 +8,7 @@ type Sig struct {
Sig [ed25519.SignatureSize]byte
}
-func (v *Sig) Err() error {
+func (v *Sig) Validate() error {
if v.PKAlg != pkAlg {
return ErrInvalidPK
}
@@ -35,5 +35,5 @@ func NewSig(data []byte) (*Sig, error) {
if err := sig.UnmarshalBinary(data); err != nil {
return nil, err
}
- return sig, sig.Err()
+ return sig, sig.Validate()
}