From 8084465e13ee600c733b709059dfbaa753603674 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Fri, 4 Aug 2017 23:23:51 +0200 Subject: Rename file to b64file --- verify.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'verify.go') diff --git a/verify.go b/verify.go index bf73af5..25615a1 100644 --- a/verify.go +++ b/verify.go @@ -6,7 +6,7 @@ import ( "io/ioutil" "os" - "dim13.org/signify/file" + "dim13.org/signify/b64file" "dim13.org/signify/key" "dim13.org/signify/zsig" ) @@ -30,7 +30,7 @@ func verify(args []string) error { return nil } if *sigFile == "" { - *sigFile = file.SigName(*msgFile) + *sigFile = b64file.SigName(*msgFile) } _ = keyType // TODO @@ -103,7 +103,7 @@ func verifyGzip(pubFile, sigFile string) error { } sig := new(key.Sig) - _, msg, err := file.DecodeString(z.Comment, sig) + _, msg, err := b64file.DecodeString(z.Comment, sig) if err != nil { return err } @@ -129,7 +129,7 @@ func verifyGzip(pubFile, sigFile string) error { func openPub(fname string) (*key.Pub, error) { pub := new(key.Pub) - if _, _, err := file.DecodeFile(fname, pub); err != nil { + if _, _, err := b64file.DecodeFile(fname, pub); err != nil { return nil, err } if err := pub.Validate(); err != nil { @@ -140,13 +140,13 @@ func openPub(fname string) (*key.Pub, error) { func openSig(fname string) (*key.Sig, []byte, string, error) { sig := new(key.Sig) - comment, msg, err := file.DecodeFile(fname, sig) + comment, msg, err := b64file.DecodeFile(fname, sig) if err != nil { return nil, nil, "", err } if err := sig.Validate(); err != nil { return nil, nil, "", err } - pubKey := file.PubFile(comment) + pubKey := b64file.PubFile(comment) return sig, msg, pubKey, nil } -- cgit v1.2.3