aboutsummaryrefslogtreecommitdiff
path: root/main.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-04-19 16:11:49 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-04-19 16:11:49 +0200
commit06c2e8eeb7bdad927ba72616bfed10fa4fdcd23b (patch)
treedddb6e98b3906c28697d7071c339b6bfb95f7d88 /main.go
parent40e0295f4cce9e42a40384f7bc2eb6806171ff58 (diff)
errors
Diffstat (limited to 'main.go')
-rw-r--r--main.go25
1 files changed, 9 insertions, 16 deletions
diff --git a/main.go b/main.go
index 08e9cd9..7f97d99 100644
--- a/main.go
+++ b/main.go
@@ -1,7 +1,6 @@
package main
import (
- "errors"
"flag"
"fmt"
"io/ioutil"
@@ -17,12 +16,6 @@ import (
*/
var (
- ErrInvalidKey = errors.New("invalid key")
- ErrInvalidSig = errors.New("signature verfication failed")
- verOK = "Signature Verfied"
-)
-
-var (
checksum = flag.Bool("C", false, "Verify a signed checksum list")
generate = flag.Bool("G", false, "Generate a new key pair")
sign = flag.Bool("S", false, "Sign the specfied message")
@@ -121,8 +114,8 @@ func OpenSec(fname string) (*EncKey, error) {
}
encKey.Kdf(pass, int(encKey.KDFRounds))
}
- if !encKey.IsValid() {
- return nil, ErrInvalidKey
+ if err := encKey.Check(); err != nil {
+ return nil, err
}
return encKey, nil
}
@@ -136,8 +129,8 @@ func OpenPub(fname string) (*PubKey, error) {
if err := Unmarshal(f.RawKey, pubKey); err != nil {
return nil, err
}
- if !pubKey.IsValid() {
- return nil, ErrInvalidKey
+ if err := pubKey.Check(); err != nil {
+ return nil, err
}
return pubKey, nil
}
@@ -151,8 +144,8 @@ func OpenSig(fname string) (*Sig, []byte, error) {
if err := Unmarshal(f.RawKey, sig); err != nil {
return nil, nil, err
}
- if !sig.IsValid() {
- return nil, nil, ErrInvalidKey
+ if err := sig.Check(); err != nil {
+ return nil, nil, err
}
if f.Embedded() {
return sig, f.Message, nil
@@ -200,9 +193,9 @@ func Verify(msgFile, pubFile string) error {
if err != nil {
return err
}
- if !pubKey.Verify(body, sig) {
- return ErrInvalidSig
+ if err := pubKey.Verify(body, sig); err != nil {
+ return err
}
- log.Println(verOK)
+ log.Println("Signature Verfied")
return nil
}