From aaef79577ef5d1e6cdcb0d85b6f628ed5b05ed24 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Wed, 26 Jul 2017 03:07:42 +0200 Subject: Check sig --- verify.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'verify.go') diff --git a/verify.go b/verify.go index 3d445d3..bf73af5 100644 --- a/verify.go +++ b/verify.go @@ -4,7 +4,6 @@ import ( "flag" "fmt" "io/ioutil" - "log" "os" "dim13.org/signify/file" @@ -39,7 +38,7 @@ func verify(args []string) error { case *zip && *embedded: return ErrEZ case *zip: - if err := verifyGzip(*pubFile, *msgFile); err != nil { + if err := verifyGzip(*pubFile, *sigFile); err != nil { return err } case *embedded: @@ -92,8 +91,7 @@ func verifyEmbedded(pubFile, sigFile string) error { } // TODO ugly work-in-progress -func verifyGzip(pubFile, msgFile string) error { - sigFile := msgFile + ".sig" // XXX +func verifyGzip(pubFile, sigFile string) error { fd, err := os.Open(sigFile) if err != nil { return err @@ -104,12 +102,14 @@ func verifyGzip(pubFile, msgFile string) error { return err } - log.Println(z) sig := new(key.Sig) _, msg, err := file.DecodeString(z.Comment, sig) if err != nil { return err } + if err := sig.Validate(); err != nil { + return err + } pub, err := openPub(pubFile) if err != nil { @@ -119,7 +119,6 @@ func verifyGzip(pubFile, msgFile string) error { return err } - log.Printf("%s", msg) zhead, err := zsig.ParseBytes(msg) if err != nil { return err -- cgit v1.2.3