aboutsummaryrefslogtreecommitdiff
path: root/cmd_verify.go
diff options
context:
space:
mode:
Diffstat (limited to 'cmd_verify.go')
-rw-r--r--cmd_verify.go74
1 files changed, 37 insertions, 37 deletions
diff --git a/cmd_verify.go b/cmd_verify.go
index eaa25cf..148c75f 100644
--- a/cmd_verify.go
+++ b/cmd_verify.go
@@ -16,7 +16,7 @@ import (
// Usage: signify -V [-eqz] [-p pubkey] [-t keytype] [-x sigfile] -m message
-type verifyCommand struct {
+type verifyCmd struct {
embed bool
quiet bool
zip bool
@@ -26,82 +26,82 @@ type verifyCommand struct {
msgFile string
}
-func (v *verifyCommand) Name() string { return "verify" }
-func (v *verifyCommand) Synopsis() string { return "verify signature" }
-func (v *verifyCommand) Usage() string {
+func (m *verifyCmd) Name() string { return "verify" }
+func (m *verifyCmd) Synopsis() string { return "verify signature" }
+func (m *verifyCmd) Usage() string {
return "verify [-eqz] [-p pubkey] [-t keytype] [-x sigfile] -m message\n"
}
-func (v *verifyCommand) SetFlags(f *flag.FlagSet) {
- f.BoolVar(&v.embed, "e", false, "embed message")
- f.BoolVar(&v.quiet, "q", false, "quiet mode")
- f.BoolVar(&v.zip, "z", false, "verify gzip archive") // TODO
- f.StringVar(&v.pubFile, "p", "", "public key file")
- f.StringVar(&v.keyFile, "t", "", "key type") // TODO
- f.StringVar(&v.sigFile, "x", "", "signature file")
- f.StringVar(&v.msgFile, "m", "", "message file (required)")
+func (m *verifyCmd) SetFlags(f *flag.FlagSet) {
+ f.BoolVar(&m.embed, "e", false, "embed message")
+ f.BoolVar(&m.quiet, "q", false, "quiet mode")
+ f.BoolVar(&m.zip, "z", false, "verify gzip archive") // TODO
+ f.StringVar(&m.pubFile, "p", "", "public key file")
+ f.StringVar(&m.keyFile, "t", "", "key type") // TODO
+ f.StringVar(&m.sigFile, "x", "", "signature file")
+ f.StringVar(&m.msgFile, "m", "", "message file (required)")
}
-func (v *verifyCommand) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{}) subcommands.ExitStatus {
- if v.msgFile == "" {
+func (m *verifyCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{}) subcommands.ExitStatus {
+ if m.msgFile == "" {
f.Usage()
return subcommands.ExitUsageError
}
- if v.sigFile == "" {
- v.sigFile = SigName(v.msgFile)
+ if m.sigFile == "" {
+ m.sigFile = SigName(m.msgFile)
}
// TODO keyType
var err error
switch {
- case v.zip && v.embed:
+ case m.zip && m.embed:
f.Usage()
return subcommands.ExitUsageError
- case v.zip:
- err = v.zipped()
- case v.embed:
- err = v.embedded()
+ case m.zip:
+ err = m.zipped()
+ case m.embed:
+ err = m.embedded()
default:
- err = v.plain()
+ err = m.plain()
}
if err != nil {
log.Println(err)
return subcommands.ExitFailure
}
- if !v.quiet {
+ if !m.quiet {
fmt.Println("Signature Verified")
}
return subcommands.ExitSuccess
}
-func (v *verifyCommand) plain() error {
- msg, err := ioutil.ReadFile(v.msgFile)
+func (m *verifyCmd) plain() error {
+ msg, err := ioutil.ReadFile(m.msgFile)
if err != nil {
return err
}
- sig, _, verifyWith, err := openSig(v.sigFile)
+ sig, _, verifyWith, err := openSig(m.sigFile)
if err != nil {
return err
}
- if v.pubFile == "" {
- v.pubFile = verifyWith
+ if m.pubFile == "" {
+ m.pubFile = verifyWith
}
- pub, err := openPub(v.pubFile)
+ pub, err := openPub(m.pubFile)
if err != nil {
return err
}
return sig.Verify(msg, pub)
}
-func (v *verifyCommand) embedded() error {
- sig, msg, verifyWith, err := openSig(v.sigFile)
+func (m *verifyCmd) embedded() error {
+ sig, msg, verifyWith, err := openSig(m.sigFile)
if err != nil {
return err
}
- if v.pubFile == "" {
- v.pubFile = verifyWith
+ if m.pubFile == "" {
+ m.pubFile = verifyWith
}
- pub, err := openPub(v.pubFile)
+ pub, err := openPub(m.pubFile)
if err != nil {
return err
}
@@ -109,8 +109,8 @@ func (v *verifyCommand) embedded() error {
}
// TODO ugly work-in-progress
-func (v *verifyCommand) zipped() error {
- fd, err := Open(v.sigFile)
+func (m *verifyCmd) zipped() error {
+ fd, err := Open(m.sigFile)
if err != nil {
return err
}
@@ -129,7 +129,7 @@ func (v *verifyCommand) zipped() error {
return err
}
- pub, err := openPub(v.pubFile)
+ pub, err := openPub(m.pubFile)
if err != nil {
return err
}