commit 6d4e4cb37c7d6416dfea8472e751c7b6615267a6
author Yasuhiro Matsumoto <mattn.jp@gmail.com> Sun Dec 22 03:38:13 2019 +0900
committer Alex Brainman <alex.brainman@gmail.com> Wed Jan 15 08:54:10 2020 +0000
tree cb4c077553fe8c831e07e1c4a65941c0300a9b4f
parent 61a87790db17894570dfb32dbaa0a4af9ce60cb4

ssh/terminal: stop using ENABLE_LINE_INPUT

ReadConsole does not read more than 254 bytes when ENABLE_LINE_INPUT is
enabled.

Fixes golang/go#36071

Change-Id: If5c160404b855387a80f1d57638aac3f2db1a097
Reviewed-on: https://go-review.googlesource.com/c/crypto/+/212377
Run-TryBot: Alex Brainman <alex.brainman@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Alex Brainman <alex.brainman@gmail.com>

ssh/terminal/terminal.go

diff --git a/ssh/terminal/terminal.go b/ssh/terminal/terminal.go
index 2f04ee5..dd7378c 100644
--- a/ssh/terminal/terminal.go
+++ b/ssh/terminal/terminal.go
@@ -947,6 +947,10 @@
 		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':

ssh/terminal/util_windows.go

diff --git a/ssh/terminal/util_windows.go b/ssh/terminal/util_windows.go
index 5cfdf8f..f614e9c 100644
--- a/ssh/terminal/util_windows.go
+++ b/ssh/terminal/util_windows.go
@@ -85,8 +85,8 @@
 	}
 	old := st
 
-	st &^= (windows.ENABLE_ECHO_INPUT)
-	st |= (windows.ENABLE_PROCESSED_INPUT | windows.ENABLE_LINE_INPUT | windows.ENABLE_PROCESSED_OUTPUT)
+	st &^= (windows.ENABLE_ECHO_INPUT | windows.ENABLE_LINE_INPUT)
+	st |= (windows.ENABLE_PROCESSED_OUTPUT | windows.ENABLE_PROCESSED_INPUT)
 	if err := windows.SetConsoleMode(windows.Handle(fd), st); err != nil {
 		return nil, err
 	}