aboutsummaryrefslogtreecommitdiff
path: root/verify.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-17 23:55:23 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-17 23:55:23 +0200
commitcd6f888802f217ca0cd0509a999696f6c4235c20 (patch)
tree3273a2b84af193e7024c3e721e6a58204dcb3460 /verify.go
parent450a6898f5062d461d5c0932182e3140c6f16d9e (diff)
Refactor ask
Diffstat (limited to 'verify.go')
-rw-r--r--verify.go16
1 files changed, 3 insertions, 13 deletions
diff --git a/verify.go b/verify.go
index b76a8fa..bbfaba7 100644
--- a/verify.go
+++ b/verify.go
@@ -67,14 +67,7 @@ func OpenPub(fname string) (*key.Pub, error) {
if err != nil {
return nil, err
}
- pubKey := new(key.Pub)
- if err := key.Unmarshal(block.Bytes, pubKey); err != nil {
- return nil, err
- }
- if err := pubKey.Check(); err != nil {
- return nil, err
- }
- return pubKey, nil
+ return key.ParsePub(block.Bytes)
}
func OpenSig(fname string) (*key.Sig, []byte, string, error) {
@@ -82,11 +75,8 @@ func OpenSig(fname string) (*key.Sig, []byte, string, error) {
if err != nil {
return nil, nil, "", err
}
- sig := new(key.Sig)
- if err := key.Unmarshal(block.Bytes, sig); err != nil {
- return nil, nil, "", err
- }
- if err := sig.Check(); err != nil {
+ sig, err := key.ParseSig(block.Bytes)
+ if err != nil {
return nil, nil, "", err
}
pubKey, _ := file.PubFile(block.Comment)