Merge pull request #683 from embhorn/zd17917

ejohnstown · web-flow · commit 8839376d349f · 2024-05-02T14:05:13.000-07:00
Fix state in DoUserAuthRequestPublicKey
diff --git a/src/internal.c b/src/internal.c
@@ -6783,11 +6783,8 @@ static int DoUserAuthRequestPublicKey(WOLFSSH* ssh, WS_UserAuthData* authData,
                         WLOG(WS_LOG_DEBUG, "DUARPK: user overriding success");
                         authFailure = 1;
                     }
-                    else {
-                        ssh->clientState = CLIENT_USERAUTH_DONE;
-                    }
                 }
-                else {
+                if (!authFailure && !partialSuccess) {
                     ssh->clientState = CLIENT_USERAUTH_DONE;
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -6783,11 +6783,8 @@ static int DoUserAuthRequestPublicKey(WOLFSSH* ssh, WS_UserAuthData* authData,`
`6783`	`6783`	`WLOG(WS_LOG_DEBUG, "DUARPK: user overriding success");`
`6784`	`6784`	`authFailure = 1;`
`6785`	`6785`	`}`
`6786`		`- else {`
`6787`		`- ssh->clientState = CLIENT_USERAUTH_DONE;`
`6788`		`- }`
`6789`	`6786`	`}`
`6790`		`- else {`
	`6787`	`+ if (!authFailure && !partialSuccess) {`
`6791`	`6788`	`ssh->clientState = CLIENT_USERAUTH_DONE;`
`6792`	`6789`	`}`
`6793`	`6790`	`}`