aboutsummaryrefslogtreecommitdiff
path: root/verify.go
diff options
context:
space:
mode:
Diffstat (limited to 'verify.go')
-rw-r--r--verify.go17
1 files changed, 13 insertions, 4 deletions
diff --git a/verify.go b/verify.go
index 5a04d50..0f5294e 100644
--- a/verify.go
+++ b/verify.go
@@ -4,7 +4,6 @@ import (
"flag"
"fmt"
"io/ioutil"
- "os"
"dim13.org/signify/b64file"
"dim13.org/signify/key"
@@ -92,7 +91,7 @@ func verifyEmbedded(pubFile, sigFile string) error {
// TODO ugly work-in-progress
func verifyGzip(pubFile, sigFile string) error {
- fd, err := os.Open(sigFile)
+ fd, err := Open(sigFile)
if err != nil {
return err
}
@@ -129,7 +128,12 @@ func verifyGzip(pubFile, sigFile string) error {
func openPub(fname string) (*key.Pub, error) {
pub := new(key.Pub)
- if _, _, err := b64file.DecodeFile(fname, pub); err != nil {
+ fd, err := Open(fname)
+ if err != nil {
+ return nil, err
+ }
+ defer fd.Close()
+ if _, _, err := b64file.Decode(fd, pub); err != nil {
return nil, err
}
if err := pub.Validate(); err != nil {
@@ -140,7 +144,12 @@ func openPub(fname string) (*key.Pub, error) {
func openSig(fname string) (*key.Sig, []byte, string, error) {
sig := new(key.Sig)
- comment, msg, err := b64file.DecodeFile(fname, sig)
+ fd, err := Open(fname)
+ if err != nil {
+ return nil, nil, "", err
+ }
+ defer fd.Close()
+ comment, msg, err := b64file.Decode(fd, sig)
if err != nil {
return nil, nil, "", err
}