aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDimitri Sokolyuk <demon@dim13.org>2017-07-18 00:07:15 +0200
committerDimitri Sokolyuk <demon@dim13.org>2017-07-18 00:07:15 +0200
commit9016e5ac116959e6795b7e65eab90228be5f0240 (patch)
treedc9f907a9cf7c4ee8d2045fa108cd0e736612ca0
parentcd6f888802f217ca0cd0509a999696f6c4235c20 (diff)
bikeshadding
-rw-r--r--ask/ask.go8
-rw-r--r--ask/ask_test.go2
2 files changed, 5 insertions, 5 deletions
diff --git a/ask/ask.go b/ask/ask.go
index d554d32..253245e 100644
--- a/ask/ask.go
+++ b/ask/ask.go
@@ -48,11 +48,11 @@ func confirmed() (string, error) {
return "", err
}
defer restore()
- pass, err := ask(os.Stdin, promtPassphrase)
+ pass, err := readPassword(os.Stdin, promtPassphrase)
if err != nil {
return "", err
}
- pass2, err := ask(os.Stdin, promtConfirmed)
+ pass2, err := readPassword(os.Stdin, promtConfirmed)
if err != nil {
return "", err
}
@@ -69,10 +69,10 @@ func passphrase() (string, error) {
return "", err
}
defer restore()
- return ask(os.Stdin, promtPassphrase)
+ return readPassword(os.Stdin, promtPassphrase)
}
-func ask(rw io.ReadWriter, prompt string) (string, error) {
+func readPassword(rw io.ReadWriter, prompt string) (string, error) {
pass, err := terminal.NewTerminal(rw, "").ReadPassword(prompt)
if err != nil {
return "", err
diff --git a/ask/ask_test.go b/ask/ask_test.go
index ae1e52c..ec339ec 100644
--- a/ask/ask_test.go
+++ b/ask/ask_test.go
@@ -16,7 +16,7 @@ func TestAsk(t *testing.T) {
for _, tc := range testCases {
t.Run(tc.input, func(t *testing.T) {
buf := bytes.NewBufferString(tc.input + "\r")
- pass, err := ask(buf, "")
+ pass, err := readPassword(buf, "")
if err != tc.err {
t.Fatalf("got %v, want %v", err, tc.err)
}