feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

src/ssl.c: fixes for cppcheck complaints: uselessAssignmentPtrArg autoVariables[not a defect; added suppression] invalidPrintfArgType_sint nullPointerRedundantCheck pointerSize

Browse Source
This commit is contained in:
Daniel Pouzzner
2022-01-08 00:28:09 -06:00
parent 4d3dfc451d
commit bb727d2ef2
1 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

70
src/ssl.c
View File

@ -5457,12 +5457,12 @@ static int ProcessBufferTryDecode(WOLFSSL_CTX* ctx, WOLFSSL* ssl, DerBuffer* der
(void)devId; (void)devId;
if (ctx == NULL && ssl == NULL) if (ctx == NULL && ssl == NULL)
ret = BAD_FUNC_ARG; return BAD_FUNC_ARG;
if (!der || !keySz || !idx || !resetSuites || !keyFormat) if (!der || !keySz || !idx || !resetSuites || !keyFormat)
ret = BAD_FUNC_ARG; return BAD_FUNC_ARG;
#ifndef NO_RSA #ifndef NO_RSA
if (ret == 0 && (*keyFormat == 0 || *keyFormat == RSAk)) { if ((*keyFormat == 0 || *keyFormat == RSAk)) {
/* make sure RSA key can be used */ /* make sure RSA key can be used */
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
RsaKey* key; RsaKey* key;
@ -5530,10 +5530,12 @@ static int ProcessBufferTryDecode(WOLFSSL_CTX* ctx, WOLFSSL* ssl, DerBuffer* der
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(key, heap, DYNAMIC_TYPE_RSA); XFREE(key, heap, DYNAMIC_TYPE_RSA);
#endif #endif
if (ret != 0)
return ret;
} }
#endif #endif
#ifdef HAVE_ECC #ifdef HAVE_ECC
if (ret == 0 && (*keyFormat == 0 || *keyFormat == ECDSAk)) { if ((*keyFormat == 0 || *keyFormat == ECDSAk)) {
/* make sure ECC key can be used */ /* make sure ECC key can be used */
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
ecc_key* key; ecc_key* key;
@ -5593,10 +5595,12 @@ static int ProcessBufferTryDecode(WOLFSSL_CTX* ctx, WOLFSSL* ssl, DerBuffer* der
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(key, heap, DYNAMIC_TYPE_ECC); XFREE(key, heap, DYNAMIC_TYPE_ECC);
#endif #endif
if (ret != 0)
return ret;
} }
#endif /* HAVE_ECC */ #endif /* HAVE_ECC */
#if defined(HAVE_ED25519) && defined(HAVE_ED25519_KEY_IMPORT) #if defined(HAVE_ED25519) && defined(HAVE_ED25519_KEY_IMPORT)
if (ret == 0 && (*keyFormat == 0 || *keyFormat == ED25519k)) { if ((*keyFormat == 0 || *keyFormat == ED25519k)) {
/* make sure Ed25519 key can be used */ /* make sure Ed25519 key can be used */
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
ed25519_key* key; ed25519_key* key;
@ -5662,10 +5666,12 @@ static int ProcessBufferTryDecode(WOLFSSL_CTX* ctx, WOLFSSL* ssl, DerBuffer* der
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(key, heap, DYNAMIC_TYPE_ED25519); XFREE(key, heap, DYNAMIC_TYPE_ED25519);
#endif #endif
if (ret != 0)
return ret;
} }
#endif /* HAVE_ED25519 && HAVE_ED25519_KEY_IMPORT */ #endif /* HAVE_ED25519 && HAVE_ED25519_KEY_IMPORT */
#if defined(HAVE_ED448) && defined(HAVE_ED448_KEY_IMPORT) #if defined(HAVE_ED448) && defined(HAVE_ED448_KEY_IMPORT)
if (ret == 0 && (*keyFormat == 0 || *keyFormat == ED448k)) { if ((*keyFormat == 0 || *keyFormat == ED448k)) {
/* make sure Ed448 key can be used */ /* make sure Ed448 key can be used */
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
ed448_key* key = NULL; ed448_key* key = NULL;
@ -5720,11 +5726,13 @@ static int ProcessBufferTryDecode(WOLFSSL_CTX* ctx, WOLFSSL* ssl, DerBuffer* der
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
XFREE(key, heap, DYNAMIC_TYPE_ED448); XFREE(key, heap, DYNAMIC_TYPE_ED448);
#endif #endif
if (ret != 0)
return ret;
} }
#endif /* HAVE_ED448 && HAVE_ED448_KEY_IMPORT */ #endif /* HAVE_ED448 && HAVE_ED448_KEY_IMPORT */
#ifdef HAVE_PQC #ifdef HAVE_PQC
if (ret == 0 && ((*keyFormat == 0) || (*keyFormat == FALCON_LEVEL1k) || if (((*keyFormat == 0) || (*keyFormat == FALCON_LEVEL1k) ||
(*keyFormat == FALCON_LEVEL5k))) { (*keyFormat == FALCON_LEVEL5k))) {
/* make sure Falcon key can be used */ /* make sure Falcon key can be used */
falcon_key* key = (falcon_key*)XMALLOC(sizeof(falcon_key), heap, falcon_key* key = (falcon_key*)XMALLOC(sizeof(falcon_key), heap,
DYNAMIC_TYPE_FALCON); DYNAMIC_TYPE_FALCON);
@ -5768,7 +5776,7 @@ static int ProcessBufferTryDecode(WOLFSSL_CTX* ctx, WOLFSSL* ssl, DerBuffer* der
} }
ssl->buffers.keySz = *keySz; ssl->buffers.keySz = *keySz;
} }
else if (ctx) { else {
if (*keyFormat == FALCON_LEVEL1k) { if (*keyFormat == FALCON_LEVEL1k) {
ctx->privateKeyType = falcon_level1_sa_algo; ctx->privateKeyType = falcon_level1_sa_algo;
} }
@ -5785,6 +5793,8 @@ static int ProcessBufferTryDecode(WOLFSSL_CTX* ctx, WOLFSSL* ssl, DerBuffer* der
wc_falcon_free(key); wc_falcon_free(key);
} }
XFREE(key, heap, DYNAMIC_TYPE_FALCON); XFREE(key, heap, DYNAMIC_TYPE_FALCON);
if (ret != 0)
return ret;
} }
#endif /* HAVE_PQC */ #endif /* HAVE_PQC */
return ret; return ret;
@ -7154,7 +7164,7 @@ int wolfSSL_CTX_DisableOCSPMustStaple(WOLFSSL_CTX* ctx)
#define GET_VERIFY_SETTING_CTX(ctx) \ #define GET_VERIFY_SETTING_CTX(ctx) \
(ctx && ctx->verifyNone ? NO_VERIFY : VERIFY) (ctx && ctx->verifyNone ? NO_VERIFY : VERIFY)
#define GET_VERIFY_SETTING_SSL(ssl) \ #define GET_VERIFY_SETTING_SSL(ssl) \
(ssl && ssl->options.verifyNone ? NO_VERIFY : VERIFY) (ssl->options.verifyNone ? NO_VERIFY : VERIFY)
#ifndef NO_FILESYSTEM #ifndef NO_FILESYSTEM
@ -15423,7 +15433,9 @@ int SetSession(WOLFSSL* ssl, WOLFSSL_SESSION* session)
#endif #endif
return ret; return ret;
} }
session = NULL; /* invalidate the provided session, only use ssl->session */ /* don't use the provided session pointer from here to end of func, only use
* ssl->session.
*/
#ifdef OPENSSL_EXTRA #ifdef OPENSSL_EXTRA
/* check for application context id */ /* check for application context id */
@ -15977,12 +15989,12 @@ int wolfSSL_get_session_stats(word32* active, word32* total, word32* peak,
&peak, &maxSessions); &peak, &maxSessions);
if (ret != WOLFSSL_SUCCESS) if (ret != WOLFSSL_SUCCESS)
return ret; return ret;
printf("Total Sessions Seen = %d\n", totalSessionsSeen); printf("Total Sessions Seen = %u\n", totalSessionsSeen);
printf("Total Sessions Now = %d\n", totalSessionsNow); printf("Total Sessions Now = %u\n", totalSessionsNow);
#ifdef WOLFSSL_PEAK_SESSIONS #ifdef WOLFSSL_PEAK_SESSIONS
printf("Peak Sessions = %d\n", peak); printf("Peak Sessions = %u\n", peak);
#endif #endif
printf("Max Sessions = %d\n", maxSessions); printf("Max Sessions = %u\n", maxSessions);
E = (double)totalSessionsSeen / SESSION_ROWS; E = (double)totalSessionsSeen / SESSION_ROWS;
@ -18691,7 +18703,7 @@ int wolfSSL_CTX_get_max_proto_version(WOLFSSL_CTX* ctx)
options = wolfSSL_CTX_get_options(ctx); options = wolfSSL_CTX_get_options(ctx);
} }
if (ctx->maxProto) { if ((ctx != NULL) && ctx->maxProto) {
ret = 0; ret = 0;
} }
else { else {
@ -25196,7 +25208,7 @@ int wolfSSL_X509_cmp(const WOLFSSL_X509 *a, const WOLFSSL_X509 *b)
#endif #endif
} }
XSNPRINTF(tmp, sizeof(tmp) - 1, XSNPRINTF(tmp, sizeof(tmp) - 1,
"\n Exponent: %d (0x%x)\n",idx, idx); "\n Exponent: %u (0x%x)\n",idx, idx);
if (wolfSSL_BIO_write(bio, tmp, if (wolfSSL_BIO_write(bio, tmp,
(int)XSTRLEN(tmp)) <= 0) { (int)XSTRLEN(tmp)) <= 0) {
XFREE(rawKey, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(rawKey, NULL, DYNAMIC_TYPE_TMP_BUFFER);
@ -32055,8 +32067,8 @@ end:
int wolfSSL_SESSION_has_ticket(const WOLFSSL_SESSION* sess) int wolfSSL_SESSION_has_ticket(const WOLFSSL_SESSION* sess)
{ {
WOLFSSL_ENTER("wolfSSL_SESSION_has_ticket"); WOLFSSL_ENTER("wolfSSL_SESSION_has_ticket");
sess = GetSessionPtr(sess);
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
sess = GetSessionPtr(sess);
if (sess) { if (sess) {
if ((sess->ticketLen > 0) && (sess->ticket != NULL)) { if ((sess->ticketLen > 0) && (sess->ticket != NULL)) {
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
@ -40968,7 +40980,7 @@ int wolfSSL_RSA_print(WOLFSSL_BIO* bio, WOLFSSL_RSA* rsa, int offset)
idx = ByteReverseWord32(idx); idx = ByteReverseWord32(idx);
#endif #endif
} }
XSNPRINTF(tmp, sizeof(tmp) - 1, "\nExponent: %d (0x%x)", idx, idx); XSNPRINTF(tmp, sizeof(tmp) - 1, "\nExponent: %u (0x%x)", idx, idx);
if (wolfSSL_BIO_write(bio, tmp, (int)XSTRLEN(tmp)) <= 0) { if (wolfSSL_BIO_write(bio, tmp, (int)XSTRLEN(tmp)) <= 0) {
XFREE(rawKey, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(rawKey, NULL, DYNAMIC_TYPE_TMP_BUFFER);
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
@ -44850,6 +44862,8 @@ err:
if (pemBio) if (pemBio)
wolfSSL_BIO_free(pemBio); wolfSSL_BIO_free(pemBio);
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
#else /* ! (WOLFSSL_PEM_TO_DER || WOLFSSL_DER_TO_PEM) */
return WOLFSSL_FAILURE;
#endif /* WOLFSSL_PEM_TO_DER || WOLFSSL_DER_TO_PEM */ #endif /* WOLFSSL_PEM_TO_DER || WOLFSSL_DER_TO_PEM */
} }
@ -55212,7 +55226,7 @@ int wolfSSL_PEM_write_bio_PKCS8PrivateKey(WOLFSSL_BIO* bio,
int algId; int algId;
const byte* curveOid; const byte* curveOid;
word32 oidSz; word32 oidSz;
int encAlgId; int encAlgId = 0;
if (bio == NULL || pkey == NULL) if (bio == NULL || pkey == NULL)
return -1; return -1;
@ -62188,7 +62202,7 @@ int wolfSSL_i2d_PKCS7(PKCS7 *p7, unsigned char **out)
WOLFSSL_MSG("wc_InitRng error"); WOLFSSL_MSG("wc_InitRng error");
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
p7->rng = &rng; p7->rng = &rng; // cppcheck-suppress autoVariables
} }
if ((len = wc_PKCS7_EncodeSignedData(p7, NULL, 0)) < 0) { if ((len = wc_PKCS7_EncodeSignedData(p7, NULL, 0)) < 0) {
@ -62535,13 +62549,13 @@ WOLFSSL_API PKCS7* wolfSSL_SMIME_read_PKCS7(WOLFSSL_BIO* in,
size_t boundLen = 0; size_t boundLen = 0;
char* boundary = NULL; char* boundary = NULL;
static const char* kContType = "Content-Type"; static const char kContType[] = "Content-Type";
static const char* kCTE = "Content-Transfer-Encoding"; static const char kCTE[] = "Content-Transfer-Encoding";
static const char* kMultSigned = "multipart/signed"; static const char kMultSigned[] = "multipart/signed";
static const char* kAppPkcsSign = "application/pkcs7-signature"; static const char kAppPkcsSign[] = "application/pkcs7-signature";
static const char* kAppXPkcsSign = "application/x-pkcs7-signature"; static const char kAppXPkcsSign[] = "application/x-pkcs7-signature";
static const char* kAppPkcs7Mime = "application/pkcs7-mime"; static const char kAppPkcs7Mime[] = "application/pkcs7-mime";
static const char* kAppXPkcs7Mime = "application/x-pkcs7-mime"; static const char kAppXPkcs7Mime[] = "application/x-pkcs7-mime";
if (in == NULL || bcont == NULL) { if (in == NULL || bcont == NULL) {