aboutsummaryrefslogtreecommitdiff
path: root/cmd_generate.go
diff options
context:
space:
mode:
Diffstat (limited to 'cmd_generate.go')
-rw-r--r--cmd_generate.go34
1 files changed, 17 insertions, 17 deletions
diff --git a/cmd_generate.go b/cmd_generate.go
index 3d0e826..57391f6 100644
--- a/cmd_generate.go
+++ b/cmd_generate.go
@@ -15,38 +15,38 @@ import (
// Usage: signify -G [-n] [-c comment] -p pubkey -s seckey
-type generateCommand struct {
+type generateCmd struct {
nopass bool
comment string
pubFile string
secFile string
}
-func (g *generateCommand) Name() string { return "generate" }
-func (g *generateCommand) Synopsis() string { return "generate key" }
-func (g *generateCommand) Usage() string {
+func (m *generateCmd) Name() string { return "generate" }
+func (m *generateCmd) Synopsis() string { return "generate key" }
+func (m *generateCmd) Usage() string {
return "generate [-n] [-c comment] -p pubkey -s seckey\n"
}
-func (g *generateCommand) SetFlags(f *flag.FlagSet) {
- f.BoolVar(&g.nopass, "n", false, "no key passphrase")
- f.StringVar(&g.comment, "c", "signify", "comment")
- f.StringVar(&g.pubFile, "p", "", "public key file (required)")
- f.StringVar(&g.secFile, "s", "", "secret key file (required)")
+func (m *generateCmd) SetFlags(f *flag.FlagSet) {
+ f.BoolVar(&m.nopass, "n", false, "no key passphrase")
+ f.StringVar(&m.comment, "c", "signify", "comment")
+ f.StringVar(&m.pubFile, "p", "", "public key file (required)")
+ f.StringVar(&m.secFile, "s", "", "secret key file (required)")
}
-func (g *generateCommand) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{}) subcommands.ExitStatus {
- if g.pubFile == "" || g.secFile == "" {
+func (m *generateCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...interface{}) subcommands.ExitStatus {
+ if m.pubFile == "" || m.secFile == "" {
f.Usage()
return subcommands.ExitUsageError
}
- if err := ValidateNames(g.pubFile, g.secFile); err != nil {
+ if err := ValidateNames(m.pubFile, m.secFile); err != nil {
log.Println(err)
return subcommands.ExitFailure
}
var der key.Deriver
- if !g.nopass {
+ if !m.nopass {
der = ask.Confirmed{}
}
@@ -56,11 +56,11 @@ func (g *generateCommand) Execute(ctx context.Context, f *flag.FlagSet, args ...
return subcommands.ExitFailure
}
- if err := g.writeFile(g.secFile, "secret key", secKey, ModeSec); err != nil {
+ if err := m.writeFile(m.secFile, "secret key", secKey, ModeSec); err != nil {
log.Println(err)
return subcommands.ExitFailure
}
- if err := g.writeFile(g.pubFile, "public key", pubKey, ModePub); err != nil {
+ if err := m.writeFile(m.pubFile, "public key", pubKey, ModePub); err != nil {
log.Println(err)
return subcommands.ExitFailure
}
@@ -68,11 +68,11 @@ func (g *generateCommand) Execute(ctx context.Context, f *flag.FlagSet, args ...
return subcommands.ExitSuccess
}
-func (g *generateCommand) writeFile(fname, comment string, u encoding.BinaryMarshaler, mode os.FileMode) error {
+func (m *generateCmd) writeFile(fname, comment string, u encoding.BinaryMarshaler, mode os.FileMode) error {
fd, err := Create(fname, mode)
if err != nil {
return err
}
defer fd.Close()
- return b64file.Encode(fd, u, g.comment+" "+comment, nil)
+ return b64file.Encode(fd, u, m.comment+" "+comment, nil)
}