Merge pull request #4357 from invenia/cv/ssh-passphrase-incorrect

Ask for SSH credentials again when passphrase is wrong

Merge pull request #4357 from invenia/cv/ssh-passphrase-incorrect
Ask for SSH credentials again when passphrase is wrong
781d73bf · Edward Thomson · GitHub · 70e4a31a · f2f14724 · 781d73bf
Unverified Commit 781d73bf authored Oct 28, 2017 by Edward Thomson Committed by GitHub Oct 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

src/transports/ssh.c
+4 -2

No files found.
--- a/src/transports/ssh.c
+++ b/src/transports/ssh.c
@@ -419,8 +419,10 @@ static int _git_ssh_authenticate_session(
 		}
 	} while (LIBSSH2_ERROR_EAGAIN == rc || LIBSSH2_ERROR_TIMEOUT == rc);

-        if (rc == LIBSSH2_ERROR_PASSWORD_EXPIRED || rc == LIBSSH2_ERROR_AUTHENTICATION_FAILED)
-                return GIT_EAUTH;
+	if (rc == LIBSSH2_ERROR_PASSWORD_EXPIRED ||
+		rc == LIBSSH2_ERROR_AUTHENTICATION_FAILED ||
+		rc == LIBSSH2_ERROR_PUBLICKEY_UNVERIFIED)
+			return GIT_EAUTH;

 	if (rc != LIBSSH2_ERROR_NONE) {
 		if (!giterr_last())