WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #822 from rlm2002/zd20212 

Zendesk Coverity changes
pull/823/head
John Safranek 2025-07-23 11:16:17 -07:00 committed by GitHub
parent 86f3edc0a9 4796e346ad
commit 93ddf8fede
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
src/internal.c
View File

@ -3988,6 +3988,9 @@ static word32 AlgoListSz(const char* algoList)
{
word32 algoListSz;
if (algoList == NULL)
return 0;
algoListSz = (word32)WSTRLEN(algoList);
if (algoList[algoListSz-1] == ',') {
--algoListSz;
@ -13318,7 +13321,8 @@ static int BuildUserAuthRequestKeyboard(WOLFSSH* ssh, byte* output, word32* idx,
begin += LENGTH_SZ;
WMEMCPY(output + begin, authData->sf.keyboard.promptName, slen);
begin += slen;
} else {
}
else {
c32toa(0, output + begin);
begin += LENGTH_SZ;
}
@ -13328,7 +13332,8 @@ static int BuildUserAuthRequestKeyboard(WOLFSSH* ssh, byte* output, word32* idx,
begin += LENGTH_SZ;
WMEMCPY(output + begin, authData->sf.keyboard.promptInstruction, slen);
begin += slen;
} else {
}
else {
c32toa(0, output + begin);
begin += LENGTH_SZ;
}
@ -13338,7 +13343,8 @@ static int BuildUserAuthRequestKeyboard(WOLFSSH* ssh, byte* output, word32* idx,
begin += LENGTH_SZ;
WMEMCPY(output + begin, authData->sf.keyboard.promptLanguage, slen);
begin += slen;
} else {
}
else {
c32toa(0, output + begin);
begin += LENGTH_SZ;
}
@ -13370,33 +13376,38 @@ int SendUserAuthKeyboardRequest(WOLFSSH* ssh, WS_UserAuthData* authData)
WLOG(WS_LOG_DEBUG, "Entering SendUserAuthKeyboardRequest()");
if (ssh == NULL || authData == NULL) {
ret = WS_BAD_ARGUMENT;
if (ssh == NULL || ssh->ctx == NULL|| authData == NULL) {
return WS_BAD_ARGUMENT;
}
if (ssh->ctx->keyboardAuthCb == NULL) {
WLOG(WS_LOG_DEBUG, "SendUserAuthKeyboardRequest called with no Cb set");
ret = WS_BAD_USAGE;
if (ret == WS_SUCCESS){
if (ssh->ctx->keyboardAuthCb == NULL) {
WLOG(WS_LOG_DEBUG, "SendUserAuthKeyboardRequest called with no Cb set");
return WS_BAD_USAGE;
}
else {
ret = ssh->ctx->keyboardAuthCb(&authData->sf.keyboard,
ssh->keyboardAuthCtx);
}
}
if (ret == WS_SUCCESS) {
ret = ssh->ctx->keyboardAuthCb(&authData->sf.keyboard,
ssh->keyboardAuthCtx);
if (authData->sf.keyboard.promptCount > 0 &&
(authData->sf.keyboard.prompts == NULL ||
authData->sf.keyboard.promptLengths == NULL ||
authData->sf.keyboard.promptEcho == NULL)) {
ret = WS_BAD_USAGE;
}
}
if (authData->sf.keyboard.promptCount > 0 &&
(authData->sf.keyboard.prompts == NULL ||
authData->sf.keyboard.promptLengths == NULL ||
authData->sf.keyboard.promptEcho == NULL)) {
ret = WS_BAD_USAGE;
if (ret == WS_SUCCESS) {
if (authData->sf.keyboard.promptCount > WOLFSSH_MAX_PROMPTS) {
ret = WS_BAD_USAGE;
}
}
if (authData->sf.keyboard.promptCount > WOLFSSH_MAX_PROMPTS) {
ret = WS_BAD_USAGE;
}
ssh->kbAuth.promptCount = authData->sf.keyboard.promptCount;
if (ret == WS_SUCCESS)
ssh->kbAuth.promptCount = authData->sf.keyboard.promptCount;
payloadSz = MSG_ID_SZ;
if (ret == WS_SUCCESS) {
@ -13407,12 +13418,12 @@ int SendUserAuthKeyboardRequest(WOLFSSH* ssh, WS_UserAuthData* authData)
ret = PreparePacket(ssh, payloadSz);
}
output = ssh->outputBuffer.buffer;
idx = ssh->outputBuffer.length;
output[idx++] = MSGID_USERAUTH_INFO_REQUEST;
if (ret == WS_SUCCESS) {
output = ssh->outputBuffer.buffer;
idx = ssh->outputBuffer.length;
output[idx++] = MSGID_USERAUTH_INFO_REQUEST;
ret = BuildUserAuthRequestKeyboard(ssh, output, &idx, authData);
}
@ -15117,7 +15128,7 @@ static int GetAllowedAuth(WOLFSSH* ssh, char* authStr)
typeAllowed |= WOLFSSH_USERAUTH_PASSWORD;
#ifdef WOLFSSH_KEYBOARD_INTERACTIVE
if (ssh->ctx->keyboardAuthCb != NULL) {
if (ssh->ctx && ssh->ctx->keyboardAuthCb) {
typeAllowed |= WOLFSSH_USERAUTH_KEYBOARD;
}
#endif