aboutsummaryrefslogtreecommitdiff
path: root/generate.go
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-17 23:55:23 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-17 23:55:23 +0200
commitcd6f888802f217ca0cd0509a999696f6c4235c20 (patch)
tree3273a2b84af193e7024c3e721e6a58204dcb3460 /generate.go
parent450a6898f5062d461d5c0932182e3140c6f16d9e (diff)
Refactor ask
Diffstat (limited to 'generate.go')
-rw-r--r--generate.go14
1 files changed, 6 insertions, 8 deletions
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
}