Commit 1e843a31 authored by Kamil Dudka's avatar Kamil Dudka
Browse files

ssh-libssh: reduce excessive verbose output about pubkey auth 

The verbose message "Authentication using SSH public key file" was
printed each time the ssh_userauth_publickey_auto() was called, which
meant each time a packet was transferred over network because the API
operates in non-blocking mode.

This patch makes sure that the verbose message is printed just once
(when the authentication state is entered by the SSH state machine).
parent 9622c350

lib/ssh-libssh.c

+1 −2
Original line number Diff line number Diff line
@@ -618,6 +618,7 @@ static CURLcode myssh_statemach_act(struct connectdata *conn, bool *block) 
        sshc->auth_methods = ssh_userauth_list(sshc->ssh_session, NULL);

        if(sshc->auth_methods & SSH_AUTH_METHOD_PUBLICKEY) {

          state(conn, SSH_AUTH_PKEY_INIT);

          infof(data, "Authentication using SSH public key file\n");

        }

        else if(sshc->auth_methods & SSH_AUTH_METHOD_GSSAPI_MIC) {

          state(conn, SSH_AUTH_GSSAPI);
@@ -670,8 +671,6 @@ static CURLcode myssh_statemach_act(struct connectdata *conn, bool *block) 


      }

      else {

        infof(data, "Authentication using SSH public key file\n");



        rc = ssh_userauth_publickey_auto(sshc->ssh_session, NULL,

                                         data->set.ssl.key_passwd);

        if(rc == SSH_AUTH_AGAIN) {