Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Code sonar cleanup #7782

Merged
merged 4 commits into from
Jul 30, 2024
Merged

Code sonar cleanup #7782

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7e6b1bb
Fix Warning 826814.9284764
Jun 26, 2024
6175778
Fix Warning 826836.9285316
Jul 23, 2024
750abdc
Addressing PR comments
Jul 24, 2024
87386f2
Addressing PR comments
Jul 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 32 additions & 5 deletions src/ssl_load.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5102,6 +5102,24 @@ int wolfSSL_CTX_use_RSAPrivateKey(WOLFSSL_CTX* ctx, WOLFSSL_RSA* rsa)

#ifdef OPENSSL_EXTRA

#ifdef XGETENV
static char* wolfSSL_getenv_memcpy(const char* varName) {
SparkiDev marked this conversation as resolved.
Show resolved Hide resolved
char* ret = NULL;
char* env = NULL;
int len = 0;

if ((env = XGETENV(varName)) != NULL) {
len = (int)XSTRLEN(env);
ret = (char*)XMALLOC(len, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (ret != NULL) {
XMEMCPY(ret, env, len);
}
}

return ret;
}
#endif

/* Use the default paths to look for CA certificate.
*
* This is an OpenSSL compatibility layer function, but it doesn't mirror
Expand All @@ -5121,18 +5139,18 @@ int wolfSSL_CTX_set_default_verify_paths(WOLFSSL_CTX* ctx)
{
int ret;
#ifdef XGETENV
char* certDir;
char* certFile;
word32 flags;
char* certDir = NULL;
char* certFile = NULL;
word32 flags = 0;
#elif !defined(WOLFSSL_SYS_CA_CERTS)
(void)ctx;
#endif

WOLFSSL_ENTER("wolfSSL_CTX_set_default_verify_paths");

#ifdef XGETENV
certDir = XGETENV("SSL_CERT_DIR");
certFile = XGETENV("SSL_CERT_FILE");
certDir = wolfSSL_getenv_memcpy("SSL_CERT_DIR");
certFile = wolfSSL_getenv_memcpy("SSL_CERT_FILE");
flags = WOLFSSL_LOAD_FLAG_PEM_CA_ONLY;

if ((certDir != NULL) || (certFile != NULL)) {
Expand Down Expand Up @@ -5178,6 +5196,14 @@ int wolfSSL_CTX_set_default_verify_paths(WOLFSSL_CTX* ctx)
#endif
}

#ifdef XGETENV
if (certFile != NULL) {
bandi13 marked this conversation as resolved.
Show resolved Hide resolved
XFREE(certFile, NULL, DYNAMIC_TYPE_TMP_BUFFER);
}
if (certDir != NULL) {
XFREE(certDir, NULL, DYNAMIC_TYPE_TMP_BUFFER);
}
#endif
WOLFSSL_LEAVE("wolfSSL_CTX_set_default_verify_paths", ret);

return ret;
Expand Down Expand Up @@ -5293,6 +5319,7 @@ int wolfSSL_SetTmpDH(WOLFSSL* ssl, const unsigned char* p, int pSz,
pAlloc = (byte*)XMALLOC(pSz, ssl->heap, DYNAMIC_TYPE_PUBLIC_KEY);
gAlloc = (byte*)XMALLOC(gSz, ssl->heap, DYNAMIC_TYPE_PUBLIC_KEY);
if ((pAlloc == NULL) || (gAlloc == NULL)) {
/* Memory will be freed below in the (ret != 1) block */
ret = MEMORY_E;
}
}
Expand Down