nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-27 02:02:26 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
[originally from svn r6447]
This commit is contained in:
Jacob Nevins 2005-11-04 23:31:11 +00:00
parent 4496d752a9
commit 29f1ae8a7e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ssh.c
View File

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