From 96173b86a178fc9b9d0ae807e635544de0053d99 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 13 Feb 2018 01:44:27 +0100 Subject: ... --- cmd_sign.go | 64 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 32 insertions(+), 32 deletions(-) (limited to 'cmd_sign.go') diff --git a/cmd_sign.go b/cmd_sign.go index 958e42f..e1d687c 100644 --- a/cmd_sign.go +++ b/cmd_sign.go @@ -15,7 +15,7 @@ import ( // Usage: signify -S [-ez] [-x sigfile] -s seckey -m message -type signCommand struct { +type signCmd struct { embed bool zip bool sigFile string @@ -23,40 +23,40 @@ type signCommand struct { msgFile string } -func (s *signCommand) Name() string { return "sign" } -func (s *signCommand) Synopsis() string { return "sign file" } -func (s *signCommand) Usage() string { +func (m *signCmd) Name() string { return "sign" } +func (m *signCmd) Synopsis() string { return "sign file" } +func (m *signCmd) Usage() string { return "sign [-ez] [-x sigfile] -s seckey -m message\n" } -func (s *signCommand) SetFlags(f *flag.FlagSet) { - f.BoolVar(&s.embed, "e", false, "embed the message") - f.BoolVar(&s.zip, "z", false, "sign gzip archive") // TODO - f.StringVar(&s.sigFile, "x", "", "signature file") - f.StringVar(&s.secFile, "s", "", "secret file (required)") - f.StringVar(&s.msgFile, "m", "", "message file (required)") +func (m *signCmd) SetFlags(f *flag.FlagSet) { + f.BoolVar(&m.embed, "e", false, "embed the message") + f.BoolVar(&m.zip, "z", false, "sign gzip archive") // TODO + f.StringVar(&m.sigFile, "x", "", "signature file") + f.StringVar(&m.secFile, "s", "", "secret file (required)") + f.StringVar(&m.msgFile, "m", "", "message file (required)") } -func (s *signCommand) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{}) subcommands.ExitStatus { - if s.secFile == "" || s.msgFile == "" { +func (m *signCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{}) subcommands.ExitStatus { + if m.secFile == "" || m.msgFile == "" { f.Usage() return subcommands.ExitUsageError } - if s.sigFile == "" { - s.sigFile = SigName(s.msgFile) + if m.sigFile == "" { + m.sigFile = SigName(m.msgFile) } var err error switch { - case s.zip && s.embed: + case m.zip && m.embed: f.Usage() return subcommands.ExitUsageError - case s.zip: - err = s.zipped() - case s.embed: - err = s.embedded() + case m.zip: + err = m.zipped() + case m.embed: + err = m.embedded() default: - err = s.plain() + err = m.plain() } if err != nil { log.Println(err) @@ -66,18 +66,18 @@ func (s *signCommand) Execute(ctx context.Context, f *flag.FlagSet, args ...inte return subcommands.ExitSuccess } -func (s *signCommand) plain() error { - sec, err := openSec(s.secFile) +func (m *signCmd) plain() error { + sec, err := openSec(m.secFile) if err != nil { return err } - msg, err := ioutil.ReadFile(s.msgFile) + msg, err := ioutil.ReadFile(m.msgFile) if err != nil { return err } sig := sec.Sign(msg) - comment := VerifyWith(s.secFile) - fd, err := Create(s.sigFile, ModeSig) + comment := VerifyWith(m.secFile) + fd, err := Create(m.sigFile, ModeSig) if err != nil { return err } @@ -85,18 +85,18 @@ func (s *signCommand) plain() error { return b64file.Encode(fd, sig, comment, nil) } -func (s *signCommand) embedded() error { - sec, err := openSec(s.secFile) +func (m *signCmd) embedded() error { + sec, err := openSec(m.secFile) if err != nil { return err } - msg, err := ioutil.ReadFile(s.msgFile) + msg, err := ioutil.ReadFile(m.msgFile) if err != nil { return err } sig := sec.Sign(msg) - comment := VerifyWith(s.secFile) - fd, err := Create(s.sigFile, ModeSig) + comment := VerifyWith(m.secFile) + fd, err := Create(m.sigFile, ModeSig) if err != nil { return err } @@ -105,8 +105,8 @@ func (s *signCommand) embedded() error { } // TODO -func (s *signCommand) zipped() error { - fd, err := Open(s.msgFile) +func (m *signCmd) zipped() error { + fd, err := Open(m.msgFile) if err != nil { return err } -- cgit v1.2.3