From 517383f806898378c4840657521cc60eb969e9d3 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sun, 23 Jul 2017 00:53:01 +0200 Subject: bikeshadding --- verify.go | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'verify.go') 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 } -- cgit v1.2.3