aboutsummaryrefslogtreecommitdiff
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
parent22dab3a8a169c49ad85e94aeb33921269828300e (diff)
Extract ask
-rw-r--r--ask/ask.go (renamed from ask.go)16
-rw-r--r--cmd/signify/main.go5
2 files changed, 11 insertions, 10 deletions
diff --git a/ask.go b/ask/ask.go
index 574a645..76a20cc 100644
--- a/ask.go
+++ b/ask/ask.go
@@ -1,4 +1,4 @@
-package signify
+package ask
import (
"errors"
@@ -12,12 +12,12 @@ var (
ErrNoMatch = errors.New("passwords don't match")
)
-func AskConfirmed() (string, error) {
- pass, err := askPassword(os.Stdin, "passphrase: ")
+func Confirmed() (string, error) {
+ pass, err := ask(os.Stdin, "passphrase: ")
if err != nil {
return "", err
}
- pass2, err := askPassword(os.Stdin, "confirm passphrase: ")
+ pass2, err := ask(os.Stdin, "confirm passphrase: ")
if err != nil {
return "", err
}
@@ -27,11 +27,11 @@ func AskConfirmed() (string, error) {
return pass, nil
}
-func AskPassword() (string, error) {
- return askPassword(os.Stdin, "passphrase: ")
+func Password() (string, error) {
+ return ask(os.Stdin, "passphrase: ")
}
-func askPassword(f *os.File, q string) (string, error) {
+func ask(f *os.File, prompt string) (string, error) {
oldState, err := terminal.MakeRaw(int(f.Fd()))
if err != nil {
return "", err
@@ -39,7 +39,7 @@ func askPassword(f *os.File, q string) (string, error) {
defer terminal.Restore(int(f.Fd()), oldState)
term := terminal.NewTerminal(f, "")
- pass, err := term.ReadPassword(q)
+ pass, err := term.ReadPassword(prompt)
if err != nil {
return "", err
}
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
}