From 3ba60991b15533189de30753a438342c9ae247ba Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Tue, 11 Jul 2017 00:52:04 +0200 Subject: Dereference --- generate.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'generate.go') diff --git a/generate.go b/generate.go index e1406bd..9a2056a 100644 --- a/generate.go +++ b/generate.go @@ -14,17 +14,17 @@ import ( func generate(args []string) error { opts := flag.NewFlagSet("generate", flag.ExitOnError) var ( - nopass = opts.Bool("n", false, "No key passphrase") - comment = opts.String("c", "signify", "Comment") - pubFile = opts.String("p", "", "Public key file (required)") - encFile = opts.String("s", "", "Secret key file (required)") + nopass = *opts.Bool("n", false, "No key passphrase") + comment = *opts.String("c", "signify", "Comment") + pubFile = *opts.String("p", "", "Public key file (required)") + encFile = *opts.String("s", "", "Secret key file (required)") ) opts.Parse(args) - if *pubFile == "" || *encFile == "" { + if pubFile == "" || encFile == "" { opts.Usage() return nil } - if err := file.CheckNames(*pubFile, *encFile); err != nil { + if err := file.CheckNames(pubFile, encFile); err != nil { return err } pubKey, encKey, err := key.NewKey() @@ -33,17 +33,17 @@ func generate(args []string) error { } askFn := ask.Confirmed - if *nopass { + if nopass { askFn = nil } if err := Kdf(encKey, askFn); err != nil { return err } - if err := writeFile(*encFile, *comment+" secret key", encKey, file.EncMode); err != nil { + if err := writeFile(encFile, comment+" secret key", encKey, file.EncMode); err != nil { return err } - if err := writeFile(*pubFile, *comment+" public key", pubKey, file.PubMode); err != nil { + if err := writeFile(pubFile, comment+" public key", pubKey, file.PubMode); err != nil { return err } return nil -- cgit v1.2.3