aboutsummaryrefslogtreecommitdiff
path: root/verify.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-23 00:53:01 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-23 00:53:01 +0200
commit517383f806898378c4840657521cc60eb969e9d3 (patch)
tree435385342c6cefc9823fd96c073cb95dfcea0451 /verify.go
parent25e9c9f19f90aea367ae9831df1e7208e3f5f0b5 (diff)
bikeshadding
Diffstat (limited to 'verify.go')
-rw-r--r--verify.go19
1 files changed, 11 insertions, 8 deletions
diff --git a/verify.go b/verify.go
index dd90c55..6984382 100644
--- a/verify.go
+++ b/verify.go
@@ -63,22 +63,25 @@ func verify(args []string) error {
}
func openPub(fname string) (*key.Pub, error) {
- block, err := file.DecodeFile(fname)
- if err != nil {
+ pub := new(key.Pub)
+ if _, _, err := file.DecodeFile(fname, pub); err != nil {
+ return nil, err
+ }
+ if err := pub.Validate(); err != nil {
return nil, err
}
- return key.NewPub(block.Bytes)
+ return pub, nil
}
func openSig(fname string) (*key.Sig, []byte, string, error) {
- block, err := file.DecodeFile(fname)
+ sig := new(key.Sig)
+ comment, msg, err := file.DecodeFile(fname, sig)
if err != nil {
return nil, nil, "", err
}
- sig, err := key.NewSig(block.Bytes)
- if err != nil {
+ if err := sig.Validate(); err != nil {
return nil, nil, "", err
}
- pubKey, _ := file.PubFile(block.Comment)
- return sig, block.Message, pubKey, nil
+ pubKey, _ := file.PubFile(comment)
+ return sig, msg, pubKey, nil
}