go.crypto/ssh: try authentication methods in ClientConfig order.

LGTM=jpsugar, agl
R=agl, jpsugar
CC=golang-codereviews
https://golang.org/cl/92240045

1 files changed, 7 insertions, 5 deletions

diff --git a/ssh/client_auth.go b/ssh/client_auth.go
index 5b7aa30..c41e163 100644
--- a/ssh/client_auth.go
+++ b/ssh/client_auth.go
@@ -41,15 +41,17 @@ func (c *connection) clientAuthenticate(config *ClientConfig) error {
 		tried[auth.method()] = true
 
 		auth = nil
+
+	findNext:
 		for _, a := range config.Auth {
 			candidateMethod := a.method()
+			if tried[candidateMethod] {
+				continue
+			}
 			for _, meth := range methods {
-				if meth != candidateMethod {
-					continue
-				}
-				if !tried[meth] {
+				if meth == candidateMethod {
 					auth = a
-					break
+					break findNext
 				}
 			}
 		}