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

Code sonar cleanup (#7782)

Browse Source 
* Fix Warning 826814.9284764
* Fix Warning 826836.9285316
Co-authored-by: Andras Fekete <andras@wolfssl.com>
This commit is contained in:
András Fekete
2024-07-30 12:42:43 -04:00
committed by GitHub
parent f4c16d22a1
commit 50d60bf0e7
3 changed files with 36 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ssl_load.c
View File

@ -5095,9 +5095,9 @@ int wolfSSL_CTX_set_default_verify_paths(WOLFSSL_CTX* ctx)
{ {
int ret; int ret;
#ifdef XGETENV #ifdef XGETENV
char* certDir; char* certDir = NULL;
char* certFile; char* certFile = NULL;
word32 flags; word32 flags = 0;
#elif !defined(WOLFSSL_SYS_CA_CERTS) #elif !defined(WOLFSSL_SYS_CA_CERTS)
(void)ctx; (void)ctx;
#endif #endif
@ -5105,8 +5105,8 @@ int wolfSSL_CTX_set_default_verify_paths(WOLFSSL_CTX* ctx)
WOLFSSL_ENTER("wolfSSL_CTX_set_default_verify_paths"); WOLFSSL_ENTER("wolfSSL_CTX_set_default_verify_paths");
#ifdef XGETENV #ifdef XGETENV
certDir = XGETENV("SSL_CERT_DIR"); certDir = wc_strdup_ex(XGETENV("SSL_CERT_DIR"), DYNAMIC_TYPE_TMP_BUFFER);
certFile = XGETENV("SSL_CERT_FILE"); certFile = wc_strdup_ex(XGETENV("SSL_CERT_FILE"), DYNAMIC_TYPE_TMP_BUFFER);
flags = WOLFSSL_LOAD_FLAG_PEM_CA_ONLY; flags = WOLFSSL_LOAD_FLAG_PEM_CA_ONLY;
if ((certDir != NULL) || (certFile != NULL)) { if ((certDir != NULL) || (certFile != NULL)) {
@ -5152,6 +5152,10 @@ int wolfSSL_CTX_set_default_verify_paths(WOLFSSL_CTX* ctx)
#endif #endif
} }
#ifdef XGETENV
XFREE(certFile, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(certDir, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
WOLFSSL_LEAVE("wolfSSL_CTX_set_default_verify_paths", ret); WOLFSSL_LEAVE("wolfSSL_CTX_set_default_verify_paths", ret);
return ret; return ret;
@ -5267,6 +5271,7 @@ int wolfSSL_SetTmpDH(WOLFSSL* ssl, const unsigned char* p, int pSz,
pAlloc = (byte*)XMALLOC(pSz, ssl->heap, DYNAMIC_TYPE_PUBLIC_KEY); pAlloc = (byte*)XMALLOC(pSz, ssl->heap, DYNAMIC_TYPE_PUBLIC_KEY);
gAlloc = (byte*)XMALLOC(gSz, ssl->heap, DYNAMIC_TYPE_PUBLIC_KEY); gAlloc = (byte*)XMALLOC(gSz, ssl->heap, DYNAMIC_TYPE_PUBLIC_KEY);
if ((pAlloc == NULL) || (gAlloc == NULL)) { if ((pAlloc == NULL) || (gAlloc == NULL)) {
/* Memory will be freed below in the (ret != 1) block */
ret = MEMORY_E; ret = MEMORY_E;
} }
} }

17
wolfcrypt/src/wc_port.c
View File

@ -1177,6 +1177,23 @@ int wc_strncasecmp(const char *s1, const char *s2, size_t n)
} }
#endif /* USE_WOLF_STRNCASECMP */ #endif /* USE_WOLF_STRNCASECMP */
#ifdef USE_WOLF_STRDUP
char* wc_strdup_ex(const char *src, int memType) {
char *ret = NULL;
int len = 0;
if (src) {
len = (int)XSTRLEN(src);
ret = (char*)XMALLOC(len, NULL, memType);
if (ret != NULL) {
XMEMCPY(ret, src, len);
}
}
return ret;
}
#endif
#ifdef WOLFSSL_ATOMIC_OPS #ifdef WOLFSSL_ATOMIC_OPS
#ifdef HAVE_C___ATOMIC #ifdef HAVE_C___ATOMIC

9
wolfssl/wolfcrypt/types.h
View File

@ -919,6 +919,15 @@ typedef struct w64wrapper {
WOLFSSL_API int wc_strncasecmp(const char *s1, const char *s2, size_t n); WOLFSSL_API int wc_strncasecmp(const char *s1, const char *s2, size_t n);
#endif #endif
#if !defined(XSTRDUP) && !defined(USE_WOLF_STRDUP)
#define USE_WOLF_STRDUP
#endif
#ifdef USE_WOLF_STRDUP
WOLFSSL_LOCAL char* wc_strdup_ex(const char *src, int memType);
#define wc_strdup(src) wc_strdup_ex(src, DYNAMIC_TYPE_TMP_BUFFER)
#define XSTRDUP(src) wc_strdup(src)
#endif
#if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM) #if !defined(NO_FILESYSTEM) && !defined(NO_STDIO_FILESYSTEM)
#ifndef XGETENV #ifndef XGETENV
#ifdef NO_GETENV #ifdef NO_GETENV