From e82ff8040c08f5521269ba7958ed780bc820df0f Mon Sep 17 00:00:00 2001
From: Adam Langley <agl@golang.org>
Date: Tue, 4 Nov 2014 10:58:06 -0800
Subject: [PATCH] go.crypto/ssh/terminal: remove \r from passwords on Windows.

Fixes golang/go#9040.

(Note: can't compile or test this one prior to committing.)

LGTM=iant, bradfitz
R=bradfitz, mathias.gumz, iant
CC=golang-codereviews
https://golang.org/cl/171000043
---
 util_windows.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/util_windows.go b/util_windows.go
index 0a454e0..2dd6c3d 100644
--- a/util_windows.go
+++ b/util_windows.go
@@ -161,6 +161,9 @@ func ReadPassword(fd int) ([]byte, error) {
 		if buf[n-1] == '\n' {
 			n--
 		}
+		if n > 0 && buf[n-1] == '\r' {
+			n--
+		}
 		ret = append(ret, buf[:n]...)
 		if n < len(buf) {
 			break