aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-26 03:07:42 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-26 03:07:42 +0200
commitaaef79577ef5d1e6cdcb0d85b6f628ed5b05ed24 (patch)
tree413fe2d9e8046a682de5127958f7243d37e8291b
parent0dde4c607250fa745c7bd84298a1ebeb7ad63430 (diff)
Check sig
-rw-r--r--verify.go11
1 files changed, 5 insertions, 6 deletions
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