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

Merge pull request #908 from LinuxJedi/f-fixes 

Static code analysis fixes
pull/915/head
David Garske 2026-04-10 14:33:06 -07:00 committed by GitHub
parent 5272cc4603 841f050b61
commit aaf3e5574e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 1031 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/internal.c
View File

@ -491,6 +491,9 @@ const char* GetErrorString(int err)
case WS_KDF_E:
return "KDF error";
case WS_DISCONNECT:
return "peer sent disconnect";
default:
return "Unknown error code";
}
@ -5758,6 +5761,9 @@ static int KeyAgree_client(WOLFSSH* ssh, byte hashId, const byte* f, word32 fSz)
}
static INLINE byte SigTypeForId(byte id);
static int DoKexDhReply(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
{
struct wolfSSH_sigKeyBlock *sigKeyBlock_ptr = NULL;
@ -6007,9 +6013,10 @@ static int DoKexDhReply(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
#ifndef WOLFSSH_NO_RSA
int tmpIdx = begin - sigSz;
#endif
/* Skip past the sig name. Check it, though. Other SSH
* implementations do the verify based on the name, despite what
* was agreed upon. XXX*/
const char* expectedSigName =
IdToName(SigTypeForId(ssh->handshake->pubKeyId));
word32 expectedSigNameSz = (word32)WSTRLEN(expectedSigName);
begin = 0;
ret = GetUint32(&scratch, sig, sigSz, &begin);
if (ret == WS_SUCCESS) {
@ -6020,6 +6027,16 @@ static int DoKexDhReply(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
ret = WS_PARSE_E;
}
}
if (ret == WS_SUCCESS) {
if (scratch != expectedSigNameSz ||
WMEMCMP(sig + begin, expectedSigName, scratch) != 0) {
WLOG(WS_LOG_DEBUG,
"signature name %.*s did not match negotiated %s",
(int)scratch, (const char*)(sig + begin),
expectedSigName);
ret = WS_PARSE_E;
}
}
if (ret == WS_SUCCESS) {
begin += scratch;
ret = GetUint32(&scratch, sig, sigSz, &begin);
@ -6475,7 +6492,6 @@ static int DoDisconnect(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
const char* reasonStr = NULL;
word32 begin = *idx;
WOLFSSH_UNUSED(ssh);
WOLFSSH_UNUSED(len);
WOLFSSH_UNUSED(reasonStr);
@ -6524,7 +6540,8 @@ static int DoDisconnect(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
*idx = begin;
return WS_SUCCESS;
ssh->error = WS_DISCONNECT;
return WS_DISCONNECT;
}
@ -8629,6 +8646,7 @@ static int DoChannelOpen(WOLFSSH* ssh,
int isDirect = 0;
#endif /* WOLFSSH_FWD */
WOLFSSH_CHANNEL* newChannel = NULL;
byte channelAppended = 0;
int ret = WS_SUCCESS;
word32 fail_reason = OPEN_OK;
@ -8723,9 +8741,13 @@ static int DoChannelOpen(WOLFSSH* ssh,
}
}
#endif /* WOLFSSH_FWD */
ChannelAppend(ssh, newChannel);
ssh->clientState = CLIENT_CHANNEL_OPEN_DONE;
if (ret == WS_SUCCESS) {
ret = ChannelAppend(ssh, newChannel);
if (ret == WS_SUCCESS) {
channelAppended = 1;
ssh->clientState = CLIENT_CHANNEL_OPEN_DONE;
}
}
}
}
@ -8735,19 +8757,24 @@ static int DoChannelOpen(WOLFSSH* ssh,
else {
const char *description = NULL;
if (fail_reason == OPEN_ADMINISTRATIVELY_PROHIBITED)
if (newChannel != NULL && !channelAppended) {
ChannelDelete(newChannel, ssh->ctx->heap);
newChannel = NULL;
}
if (fail_reason == OPEN_OK) {
fail_reason = OPEN_ADMINISTRATIVELY_PROHIBITED;
description = "Channel open failed.";
}
else if (fail_reason == OPEN_ADMINISTRATIVELY_PROHIBITED)
description = "Administratively prohibited.";
else if (fail_reason == OPEN_UNKNOWN_CHANNEL_TYPE)
description = "Channel type not supported.";
else if (fail_reason == OPEN_RESOURCE_SHORTAGE)
description = "Not enough resources.";
if (description != NULL) {
ret = SendChannelOpenFail(ssh, peerChannelId,
fail_reason, description, "en");
}
else
ret = SendRequestSuccess(ssh, 0); /* XXX Is this right? */
ret = SendChannelOpenFail(ssh, peerChannelId,
fail_reason, description, "en");
}
#ifdef WOLFSSH_FWD
@ -10594,7 +10621,6 @@ static int PreparePacket(WOLFSSH* ssh, word32 payloadSz)
return ret;
}
static int BundlePacket(WOLFSSH* ssh)
{
byte* output = NULL;
@ -17563,7 +17589,7 @@ int wolfSSH_oct2dec(WOLFSSH* ssh, byte* oct, word32 octSz)
for (i = 0; i < octSz; i++)
{
if (oct[i] < '0' || oct[0] > '7') {
if (oct[i] < '0' || oct[i] > '7') {
ret = WS_BAD_ARGUMENT;
break;
}

3
src/keygen.c
View File

@ -189,7 +189,8 @@ int wolfSSH_MakeEcdsaKey(byte* out, word32 outSz, word32 size)
int wolfSSH_MakeEd25519Key(byte* out, word32 outSz, word32 size)
{
#ifndef WOLFSSH_NO_ED25519
#if !defined(WOLFSSH_NO_ED25519) && defined(HAVE_ED25519) && \
defined(HAVE_ED25519_MAKE_KEY) && defined(HAVE_ED25519_KEY_EXPORT)
int ret = WS_SUCCESS;
WC_RNG rng;

15
src/wolfsftp.c
View File

@ -4515,8 +4515,8 @@ int SFTP_RemoveHandleNode(WOLFSSH* ssh, byte* handle, word32 handleSz)
cur->prev->next = cur->next;
}
if (cur->next == NULL && cur->prev == NULL) {
ssh->handleList = NULL;
if (cur == ssh->handleList) {
ssh->handleList = cur->next;
}
WFREE(cur, ssh->ctx->heap, DYNTYPE_SFTP);
@ -4570,8 +4570,8 @@ static int SFTP_FreeHandles(WOLFSSH* ssh)
/* mktime() expects month from 0 to 11. Nucleus months
* are saved as 1 to 12. Hence 1 is being deducted to
* make it compatible with Unix time stamp. */
#define WS_GETMON(d) (_GETMON(d) - 5)
#define WS_GETHOUR(t) (_GETHOUR(t) - 1)
#define WS_GETMON(d) (_GETMON(d) - 1)
#define WS_GETHOUR(t) _GETHOUR(t)
#else
#define WS_GETMON(d) _GETMON(d)
#define WS_GETHOUR(t) _GETHOUR(t)
@ -4592,6 +4592,13 @@ static word32 TimeTo32(word16 d, word16 t)
return mktime(&tmp);
}
#ifdef WOLFSSH_TEST_INTERNAL
int wolfSSH_TestNucleusMonthFromDate(word16 d)
{
return (int)WS_GETMON(d);
}
#endif
#endif /* NO_WOLFSSH_MKTIME */

969
tests/regress.c
View File

File diff suppressed because it is too large Load Diff

8
tests/unit.c
View File

@ -31,7 +31,6 @@
#include <stdio.h>
#include <wolfssh/ssh.h>
#include <wolfssh/keygen.h>
#include <wolfssh/internal.h>
#define WOLFSSH_TEST_HEX2BIN
#include <wolfssh/test.h>
@ -265,7 +264,8 @@ static int test_EcdsaKeyGen(void)
}
#endif
#ifndef WOLFSSH_NO_ED25519
#if !defined(WOLFSSH_NO_ED25519) && defined(HAVE_ED25519) && \
defined(HAVE_ED25519_MAKE_KEY) && defined(HAVE_ED25519_KEY_EXPORT)
static int test_Ed25519KeyGen(void)
{
int result = 0;
@ -338,7 +338,6 @@ static int test_Errors(void)
return result;
}
int wolfSSH_UnitTest(int argc, char** argv)
{
int testResult = 0, unitResult = 0;
@ -367,7 +366,8 @@ int wolfSSH_UnitTest(int argc, char** argv)
printf("EcdsaKeyGen: %s\n", (unitResult == 0 ? "SUCCESS" : "FAILED"));
testResult = testResult || unitResult;
#endif
#ifndef WOLFSSH_NO_ED25519
#if !defined(WOLFSSH_NO_ED25519) && defined(HAVE_ED25519) && \
defined(HAVE_ED25519_MAKE_KEY) && defined(HAVE_ED25519_KEY_EXPORT)
unitResult = test_Ed25519KeyGen();
printf("Ed25519KeyGen: %s\n", (unitResult == 0 ? "SUCCESS" : "FAILED"));
testResult = testResult || unitResult;

3
wolfssh/error.h
View File

@ -136,8 +136,9 @@ enum WS_ErrorCodes {
WS_ED25519_E = -1095, /* Ed25519 failure */
WS_AUTH_PENDING = -1096, /* User authentication still pending */
WS_KDF_E = -1097, /* KDF error*/
WS_DISCONNECT = -1098, /* peer sent disconnect */
WS_LAST_E = WS_KDF_E /* Update this to indicate last error */
WS_LAST_E = WS_DISCONNECT /* Update this to indicate last error */
};

4
wolfssh/wolfsftp.h
View File

@ -285,6 +285,9 @@ WOLFSSH_LOCAL void wolfSSH_SFTP_ShowSizes(void);
#ifdef WOLFSSH_TEST_INTERNAL
WOLFSSH_API int wolfSSH_TestSftpBufferSend(WOLFSSH* ssh,
byte* data, word32 sz, word32 idx);
#if defined(WOLFSSL_NUCLEUS) && !defined(NO_WOLFSSH_MKTIME)
WOLFSSH_API int wolfSSH_TestNucleusMonthFromDate(word16 d);
#endif
#endif
#ifdef __cplusplus
@ -292,4 +295,3 @@ WOLFSSH_LOCAL void wolfSSH_SFTP_ShowSizes(void);
#endif
#endif /* _WOLFSSH_WOLFSFTP_H_ */