Merge pull request #450 from JacobBarthelmeh/auth

ejohnstown · web-flow · commit 1d466823f35d · 2022-09-01T13:56:20.000-07:00
fix for connecting to servers that only offer public key
diff --git a/src/internal.c b/src/internal.c
@@ -10382,7 +10382,9 @@ int SendUserAuthRequest(WOLFSSH* ssh, byte authId, int addSig)
                 }
             }
             /* fall into public key case if password case was not successful */
-            if ((ret == WS_FATAL_ERROR) && (authId & WOLFSSH_USERAUTH_PUBLICKEY)) {
+            if ((ret == WS_FATAL_ERROR ||
+                !(authId & WOLFSSH_USERAUTH_PASSWORD)) &&
+                (authId & WOLFSSH_USERAUTH_PUBLICKEY)) {
                 ret = ssh->ctx->userAuthCb(WOLFSSH_USERAUTH_PUBLICKEY,
                         &authData, ssh->userAuthCtx);
                 if (ret != WOLFSSH_USERAUTH_SUCCESS) {

Original file line number	Diff line number	Diff line change
`@@ -10382,7 +10382,9 @@ int SendUserAuthRequest(WOLFSSH* ssh, byte authId, int addSig)`
`10382`	`10382`	`}`
`10383`	`10383`	`}`
`10384`	`10384`	`/* fall into public key case if password case was not successful */`
`10385`		`- if ((ret == WS_FATAL_ERROR) && (authId & WOLFSSH_USERAUTH_PUBLICKEY)) {`
	`10385`	`+ if ((ret == WS_FATAL_ERROR \|\|`
	`10386`	`+ !(authId & WOLFSSH_USERAUTH_PASSWORD)) &&`
	`10387`	`+ (authId & WOLFSSH_USERAUTH_PUBLICKEY)) {`
`10386`	`10388`	`ret = ssh->ctx->userAuthCb(WOLFSSH_USERAUTH_PUBLICKEY,`
`10387`	`10389`	`&authData, ssh->userAuthCtx);`
`10388`	`10390`	`if (ret != WOLFSSH_USERAUTH_SUCCESS) {`