Commit c4eb10e2 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

SSH: three state machine fixups 

The SSH state machine didn't clear the 'rc' variable appropriately in a
two places which prevented it from looping the way it should. And it
lacked an 'else' statement that made it possible to erroneously get
stuck in the SSH_AUTH_AGENT state.

Reported-by: Tim Stack

Closes #357
parent 3b4ee0d4

lib/ssh.c

+7 −4
Original line number Diff line number Diff line
@@ -935,6 +935,7 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block) 
      }

      else {

        state(conn, SSH_AUTH_HOST_INIT);

        rc = 0; /* clear rc and continue */

      }

      break;
@@ -1019,10 +1020,10 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block) 
                                    sshc->sshagent_identity);



        if(rc < 0) {

          if(rc != LIBSSH2_ERROR_EAGAIN) {

          if(rc != LIBSSH2_ERROR_EAGAIN)

            /* tried and failed? go to next identity */

            sshc->sshagent_prev_identity = sshc->sshagent_identity;

          }

          else

            break;

        }

      }
@@ -1037,8 +1038,10 @@ static CURLcode ssh_statemach_act(struct connectdata *conn, bool *block) 
        infof(data, "Agent based authentication successful\n");

        state(conn, SSH_AUTH_DONE);

      }

      else

      else {

        state(conn, SSH_AUTH_KEY_INIT);

        rc = 0; /* clear rc and continue */

      }

#endif

      break;