diff --git a/console/terminal.go b/console/terminal.go index 796edc28..ba88af70 100644 --- a/console/terminal.go +++ b/console/terminal.go @@ -3,10 +3,10 @@ package console import ( "syscall" - "golang.org/x/crypto/ssh/terminal" + "golang.org/x/term" ) // RunningOnTerminal checks whether stdout is terminal func RunningOnTerminal() bool { - return terminal.IsTerminal(syscall.Stdout) + return term.IsTerminal(syscall.Stdout) } diff --git a/go.mod b/go.mod index 6f31f127..4f136fe6 100644 --- a/go.mod +++ b/go.mod @@ -40,6 +40,7 @@ require ( github.com/wsxiaoys/terminal v0.0.0-20160513160801-0940f3fc43a0 golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64 + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 golang.org/x/time v0.0.0-20211116232009-f0f3c7e86c11 google.golang.org/protobuf v1.28.0 // indirect gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c diff --git a/pgp/internal.go b/pgp/internal.go index 191743a8..add64267 100644 --- a/pgp/internal.go +++ b/pgp/internal.go @@ -14,11 +14,13 @@ import ( "github.com/pkg/errors" - "golang.org/x/crypto/openpgp" - "golang.org/x/crypto/openpgp/clearsign" - openpgp_errors "golang.org/x/crypto/openpgp/errors" - "golang.org/x/crypto/openpgp/packet" - "golang.org/x/crypto/ssh/terminal" + // TODO: replace crypto/openpgp since it is deprecated + // https://github.com/golang/go/issues/44226 + "golang.org/x/crypto/openpgp" //nolint:staticcheck + "golang.org/x/crypto/openpgp/clearsign" //nolint:staticcheck + openpgp_errors "golang.org/x/crypto/openpgp/errors" //nolint:staticcheck + "golang.org/x/crypto/openpgp/packet" //nolint:staticcheck + "golang.org/x/term" ) // Test interface @@ -174,7 +176,7 @@ func (g *GoSigner) Init() error { for attempt := 0; attempt < 3; attempt++ { fmt.Print("\nEnter passphrase: ") var bytePassphrase []byte - bytePassphrase, err = terminal.ReadPassword(int(syscall.Stdin)) + bytePassphrase, err = term.ReadPassword(int(syscall.Stdin)) if err != nil { return errors.Wrap(err, "error reading passphare") } diff --git a/pgp/openpgp.go b/pgp/openpgp.go index 22ba3f85..8577fc00 100644 --- a/pgp/openpgp.go +++ b/pgp/openpgp.go @@ -11,10 +11,12 @@ import ( "strconv" "time" - "golang.org/x/crypto/openpgp" - "golang.org/x/crypto/openpgp/armor" - "golang.org/x/crypto/openpgp/errors" - "golang.org/x/crypto/openpgp/packet" + // TODO: replace crypto/openpgp since it is deprecated + // https://github.com/golang/go/issues/44226 + "golang.org/x/crypto/openpgp" //nolint:staticcheck + "golang.org/x/crypto/openpgp/armor" //nolint:staticcheck + "golang.org/x/crypto/openpgp/errors" //nolint:staticcheck + "golang.org/x/crypto/openpgp/packet" //nolint:staticcheck ) // hashForSignature returns a pair of hashes that can be used to verify a