From 1e843a31a49484aeddf8f358e71392205f5fd6b1 Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Tue, 14 Aug 2018 13:14:49 +0200 Subject: [PATCH] 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). --- lib/ssh-libssh.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/ssh-libssh.c b/lib/ssh-libssh.c index cecf477ac..f40f074b9 100644 --- a/lib/ssh-libssh.c +++ b/lib/ssh-libssh.c @@ -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) {