From db79840bc68f803c23477e7c093e3cff2a7633ba Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Thu, 22 Apr 2021 13:53:56 +0200 Subject: cmd/fscrypt: use golang.org/x/term The golang.org/x/crypto/ssh/terminal package is deprecated and merely a wrapper around golang.org/x/term. Thus, use the latter directly. --- cmd/fscrypt/keys.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cmd/fscrypt/keys.go') diff --git a/cmd/fscrypt/keys.go b/cmd/fscrypt/keys.go index 33461ec..cb86404 100644 --- a/cmd/fscrypt/keys.go +++ b/cmd/fscrypt/keys.go @@ -28,7 +28,7 @@ import ( "os" "github.com/pkg/errors" - "golang.org/x/crypto/ssh/terminal" + "golang.org/x/term" "github.com/google/fscrypt/actions" "github.com/google/fscrypt/crypto" @@ -88,13 +88,13 @@ func (p passphraseReader) Read(buf []byte) (int, error) { func getPassphraseKey(prompt string) (*crypto.Key, error) { // Only disable echo if stdin is actually a terminal. - if terminal.IsTerminal(stdinFd) { - state, err := terminal.MakeRaw(stdinFd) + if term.IsTerminal(stdinFd) { + state, err := term.MakeRaw(stdinFd) if err != nil { return nil, err } defer func() { - terminal.Restore(stdinFd, state) + term.Restore(stdinFd, state) fmt.Println() // To align input }() } -- cgit v1.2.3