aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2018-02-13 12:53:58 +0100
committerDimitri Sokolyuk <demon@dim13.org>2018-02-13 12:53:58 +0100
commitf3c4bd7c9cef156f146286a6696bc6400cb31c88 (patch)
treee90d0a92e3e8fa1ac59dfae8f3cba3a60a874e15
parentae69d8f370a155a03ac1af0348a546268434f83a (diff)
split
-rw-r--r--cmd_generate.go22
1 files changed, 11 insertions, 11 deletions
diff --git a/cmd_generate.go b/cmd_generate.go
index 9c6006f..4b5d067 100644
--- a/cmd_generate.go
+++ b/cmd_generate.go
@@ -40,32 +40,32 @@ func (m *generateCmd) Execute(ctx context.Context, f *flag.FlagSet, args ...inte
f.Usage()
return subcommands.ExitUsageError
}
- if err := ValidateNames(m.pubFile, m.secFile); err != nil {
+ if err := m.generate(); err != nil {
log.Println(err)
return subcommands.ExitFailure
}
+ return subcommands.ExitSuccess
+}
+func (m *generateCmd) generate() error {
+ if err := ValidateNames(m.pubFile, m.secFile); err != nil {
+ return err
+ }
var der key.Deriver
if !m.nopass {
der = ask.Confirmed{}
}
-
pubKey, secKey, err := key.Generate(der)
if err != nil {
- log.Println(err)
- return subcommands.ExitFailure
+ return err
}
-
if err := m.writeFile(m.secFile, "secret key", secKey, modeSec); err != nil {
- log.Println(err)
- return subcommands.ExitFailure
+ return err
}
if err := m.writeFile(m.pubFile, "public key", pubKey, modePub); err != nil {
- log.Println(err)
- return subcommands.ExitFailure
+ return err
}
-
- return subcommands.ExitSuccess
+ return nil
}
func (m *generateCmd) writeFile(fname, comment string, u encoding.BinaryMarshaler, mode os.FileMode) error {