From: Jacob Nevins <jacobn@chiark.greenend.org.uk>
Date: Fri, 4 Nov 2005 23:31:11 +0000 (+0000)
Subject: Fix minor hiccup in SSH-1 p-k auth.
X-Git-Tag: 0.59~189
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=29f1ae8a7e2b8747188a493c76436cbff75afb3b;p=PuTTY.git

Fix minor hiccup in SSH-1 p-k auth.

[originally from svn r6447]
---

diff --git a/ssh.c b/ssh.c
index 5ca50402..71388a36 100644
--- a/ssh.c
+++ b/ssh.c
@@ -3459,7 +3459,6 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
 		    break;	       /* go and try something else */
 		} else if (ret == -1) {
 		    c_write_str(ssh, "Wrong passphrase.\r\n"); /* FIXME */
-		    s->tried_publickey = 0;
 		    got_passphrase = FALSE;
 		    /* and try again */
 		} else {
@@ -3478,7 +3477,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
 		crWaitUntil(pktin);
 		if (pktin->type == SSH1_SMSG_FAILURE) {
 		    c_write_str(ssh, "Server refused our public key.\r\n");
-		    continue;	       /* go and try password */
+		    continue;	       /* go and try something else */
 		}
 		if (pktin->type != SSH1_SMSG_AUTH_RSA_CHALLENGE) {
 		    bombout(("Bizarre response to offer of public key"));
@@ -3518,7 +3517,7 @@ static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
 		    if (flags & FLAG_VERBOSE)
 			c_write_str(ssh, "Failed to authenticate with"
 				    " our public key.\r\n");
-		    continue;	       /* go and try password */
+		    continue;	       /* go and try something else */
 		} else if (pktin->type != SSH1_SMSG_SUCCESS) {
 		    bombout(("Bizarre response to RSA authentication response"));
 		    crStop(0);