From 993c683c106ee3bd681efd6d2c37e660a75a1672 Mon Sep 17 00:00:00 2001 From: Dimitri Sokolyuk Date: Sat, 5 Aug 2017 00:08:06 +0200 Subject: cleanup --- ask/ask.go | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ask/ask.go b/ask/ask.go index f021ffd..7849c3f 100644 --- a/ask/ask.go +++ b/ask/ask.go @@ -24,7 +24,7 @@ const ( type Passphrase struct{} func (Passphrase) Derive(salt []byte, rounds int, length int) ([]byte, error) { - pass, err := passphrase() + pass, err := passphrase(os.Stdin) if err != nil { return nil, err } @@ -34,7 +34,7 @@ func (Passphrase) Derive(salt []byte, rounds int, length int) ([]byte, error) { type Confirmed struct{} func (Confirmed) Derive(salt []byte, rounds int, length int) ([]byte, error) { - pass, err := confirmed() + pass, err := confirmed(os.Stdin) if err != nil { return nil, err } @@ -42,17 +42,17 @@ func (Confirmed) Derive(salt []byte, rounds int, length int) ([]byte, error) { } // confirmed asks for password twice -func confirmed() (string, error) { - restore, err := makeRaw(os.Stdin) +func confirmed(fd *os.File) (string, error) { + restore, err := raw(fd) if err != nil { return "", err } defer restore() - pass, err := readPassword(os.Stdin, promtPassphrase) + pass, err := readPassword(fd, promtPassphrase) if err != nil { return "", err } - pass2, err := readPassword(os.Stdin, promtConfirmed) + pass2, err := readPassword(fd, promtConfirmed) if err != nil { return "", err } @@ -63,13 +63,13 @@ func confirmed() (string, error) { } // passphrase asks for passphrase once -func passphrase() (string, error) { - restore, err := makeRaw(os.Stdin) +func passphrase(fd *os.File) (string, error) { + restore, err := raw(fd) if err != nil { return "", err } defer restore() - return readPassword(os.Stdin, promtPassphrase) + return readPassword(fd, promtPassphrase) } func readPassword(rw io.ReadWriter, prompt string) (string, error) { @@ -83,7 +83,7 @@ func readPassword(rw io.ReadWriter, prompt string) (string, error) { return pass, nil } -func makeRaw(f *os.File) (func(), error) { +func raw(f *os.File) (func(), error) { fd := int(f.Fd()) oldState, err := terminal.MakeRaw(fd) if err != nil { -- cgit v1.2.3