aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-04-30 23:45:20 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-04-30 23:45:20 +0200
commit6d5a1fdf604c376a2e6bcde0ec3b0a77682db768 (patch)
tree5151735ecd4a1404e3acff8b01c18f8ad982d99d /cmd
parent22dab3a8a169c49ad85e94aeb33921269828300e (diff)
Extract ask
Diffstat (limited to 'cmd')
-rw-r--r--cmd/signify/main.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/signify/main.go b/cmd/signify/main.go
index 407609a..bad9d65 100644
--- a/cmd/signify/main.go
+++ b/cmd/signify/main.go
@@ -9,6 +9,7 @@ import (
"path/filepath"
"dim13.org/signify"
+ "dim13.org/signify/ask"
)
/*
@@ -74,7 +75,7 @@ func Generate(pubFile, secFile, comment string, nopass bool) error {
if nopass {
encKey.KDFRounds = 0
}
- encKey.Kdf(signify.AskConfirmed)
+ encKey.Kdf(ask.Confirmed)
encRaw, err := signify.Marshal(encKey)
if err != nil {
@@ -113,7 +114,7 @@ func OpenEnc(fname string) (*signify.EncKey, error) {
if err := signify.Unmarshal(f.RawKey, encKey); err != nil {
return nil, err
}
- encKey.Kdf(signify.AskPassword)
+ encKey.Kdf(ask.Password)
if err := encKey.Check(); err != nil {
return nil, err
}