From a6dd9f16574f7893b657102ccdf1f79b28b1e758 Mon Sep 17 00:00:00 2001 From: Timo Kokkonen Date: Sun, 3 Aug 2025 21:16:19 -0700 Subject: [PATCH 1/2] Fix to WOLFSSH_USERAUTH_REJECTED result from user authentication callback getting ignored for public key authentication. This changes behavior to be similar to other authentication methods. --- src/internal.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/internal.c b/src/internal.c index bc04d51a8..c167b02c5 100644 --- a/src/internal.c +++ b/src/internal.c @@ -7585,6 +7585,12 @@ static int DoUserAuthRequestPublicKey(WOLFSSH* ssh, WS_UserAuthData* authData, if (ret == WOLFSSH_USERAUTH_WOULD_BLOCK) { ret = WS_AUTH_PENDING; } + else if (ret == WOLFSSH_USERAUTH_REJECTED) { + #ifndef NO_FAILURE_ON_REJECTED + authFailure = 1; + #endif + ret = WS_USER_AUTH_E; + } else { if (ret == WOLFSSH_USERAUTH_PARTIAL_SUCCESS) { partialSuccess = 1; From 5abc8d623e68a0d179e94787590c1048bd825a88 Mon Sep 17 00:00:00 2001 From: Timo Kokkonen Date: Tue, 12 Aug 2025 22:27:15 -0700 Subject: [PATCH 2/2] Fix formating (untabify). --- src/internal.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/internal.c b/src/internal.c index c167b02c5..7e6ffac93 100644 --- a/src/internal.c +++ b/src/internal.c @@ -7585,12 +7585,12 @@ static int DoUserAuthRequestPublicKey(WOLFSSH* ssh, WS_UserAuthData* authData, if (ret == WOLFSSH_USERAUTH_WOULD_BLOCK) { ret = WS_AUTH_PENDING; } - else if (ret == WOLFSSH_USERAUTH_REJECTED) { + else if (ret == WOLFSSH_USERAUTH_REJECTED) { #ifndef NO_FAILURE_ON_REJECTED - authFailure = 1; + authFailure = 1; #endif - ret = WS_USER_AUTH_E; - } + ret = WS_USER_AUTH_E; + } else { if (ret == WOLFSSH_USERAUTH_PARTIAL_SUCCESS) { partialSuccess = 1;