From cd6f888802f217ca0cd0509a999696f6c4235c20 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Mon, 17 Jul 2017 23:55:23 +0200 Subject: Refactor ask --- generate.go | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'generate.go') diff --git a/generate.go b/generate.go index e1406bd..66fe734 100644 --- a/generate.go +++ b/generate.go @@ -27,16 +27,14 @@ func generate(args []string) error { if err := file.CheckNames(*pubFile, *encFile); err != nil { return err } - pubKey, encKey, err := key.NewKey() - if err != nil { - return err - } - askFn := ask.Confirmed - if *nopass { - askFn = nil + var deriver key.KeyDeriver + if !*nopass { + deriver = ask.Confirmed{} } - if err := Kdf(encKey, askFn); err != nil { + + pubKey, encKey, err := key.NewKey(deriver) + if err != nil { return err } -- cgit v1.2.3