Revert "vendor: update x/crypto/ssh - to fix Windows password length issues fixes #3798"

This turned out to introduce a regression, not being able to press Enter.

See: #3888 and https://github.com/golang/go/issues/36609

This reverts commit 251cfc100e.
This commit is contained in:
Nick Craig-Wood
2020-01-20 12:46:52 +00:00
parent f338a2d907
commit 18d26e2ddb
5 changed files with 6 additions and 10 deletions
-4
View File
@@ -947,10 +947,6 @@ func readPasswordLine(reader io.Reader) ([]byte, error) {
n, err := reader.Read(buf[:])
if n > 0 {
switch buf[0] {
case '\b':
if len(ret) > 0 {
ret = ret[:len(ret)-1]
}
case '\n':
return ret, nil
case '\r':
+2 -2
View File
@@ -85,8 +85,8 @@ func ReadPassword(fd int) ([]byte, error) {
}
old := st
st &^= (windows.ENABLE_ECHO_INPUT | windows.ENABLE_LINE_INPUT)
st |= (windows.ENABLE_PROCESSED_OUTPUT | windows.ENABLE_PROCESSED_INPUT)
st &^= (windows.ENABLE_ECHO_INPUT)
st |= (windows.ENABLE_PROCESSED_INPUT | windows.ENABLE_LINE_INPUT | windows.ENABLE_PROCESSED_OUTPUT)
if err := windows.SetConsoleMode(windows.Handle(fd), st); err != nil {
return nil, err
}
+1 -1
View File
@@ -203,7 +203,7 @@ go.opencensus.io/trace/propagation
go.opencensus.io/trace/tracestate
# goftp.io/server v0.0.0-20190812052725-72a57b186803
goftp.io/server
# golang.org/x/crypto v0.0.0-20200117160349-530e935923ad
# golang.org/x/crypto v0.0.0-20200109152110-61a87790db17
golang.org/x/crypto/bcrypt
golang.org/x/crypto/blowfish
golang.org/x/crypto/chacha20