wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-31 19:24:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

src/ssl.c wolSSL_DH_new_by_nid(): fix cppcheck nullPointer report.

Browse Source
This commit is contained in:
Daniel Pouzzner
2022-04-26 09:58:07 -05:00
parent 5e1a358dff
commit e6d267ef16
1 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/ssl.c
View File

@@ -26453,7 +26453,7 @@ WOLFSSL_DH* wolfSSL_DH_new(void)
WOLFSSL_DH* wolSSL_DH_new_by_nid(int nid) WOLFSSL_DH* wolSSL_DH_new_by_nid(int nid)
{ {
WOLFSSL_DH* dh; WOLFSSL_DH* dh = NULL;
int err = 0; int err = 0;
#if defined(HAVE_PUBLIC_FFDHE) || (defined(HAVE_FIPS) && FIPS_VERSION_EQ(2,0)) #if defined(HAVE_PUBLIC_FFDHE) || (defined(HAVE_FIPS) && FIPS_VERSION_EQ(2,0))
const DhParams* params = NULL; const DhParams* params = NULL;
@@ -26472,16 +26472,9 @@ WOLFSSL_DH* wolSSL_DH_new_by_nid(int nid)
WOLFSSL_ENTER("wolfSSL_DH_new_by_nid"); WOLFSSL_ENTER("wolfSSL_DH_new_by_nid");
dh = wolfSSL_DH_new();
if (dh == NULL) {
WOLFSSL_MSG("Failed to create WOLFSSL_DH.");
err = 1;
}
/* HAVE_PUBLIC_FFDHE not required to expose wc_Dh_ffdhe* functions in FIPS v2 /* HAVE_PUBLIC_FFDHE not required to expose wc_Dh_ffdhe* functions in FIPS v2
* module */ * module */
#if defined(HAVE_PUBLIC_FFDHE) || (defined(HAVE_FIPS) && FIPS_VERSION_EQ(2,0)) #if defined(HAVE_PUBLIC_FFDHE) || (defined(HAVE_FIPS) && FIPS_VERSION_EQ(2,0))
if (err == 0) {
switch (nid) { switch (nid) {
#ifdef HAVE_FFDHE_2048 #ifdef HAVE_FFDHE_2048
case NID_ffdhe2048: case NID_ffdhe2048:
@@ -26501,11 +26494,17 @@ WOLFSSL_DH* wolSSL_DH_new_by_nid(int nid)
default: default:
break; break;
} }
} if (params == NULL) {
if (err == 0 && params == NULL) {
WOLFSSL_MSG("Unable to find DH params for nid."); WOLFSSL_MSG("Unable to find DH params for nid.");
err = 1; err = 1;
} }
if (err == 0) {
dh = wolfSSL_DH_new();
if (dh == NULL) {
WOLFSSL_MSG("Failed to create WOLFSSL_DH.");
err = 1;
}
}
if (err == 0) { if (err == 0) {
pBn = wolfSSL_BN_bin2bn(params->p, params->p_len, NULL); pBn = wolfSSL_BN_bin2bn(params->p, params->p_len, NULL);
if (pBn == NULL) { if (pBn == NULL) {
@@ -26536,13 +26535,15 @@ WOLFSSL_DH* wolSSL_DH_new_by_nid(int nid)
err = 1; err = 1;
} }
#else #else
if (err == 0) {
dh->p = pBn; dh->p = pBn;
dh->q = qBn; dh->q = qBn;
dh->g = gBn; dh->g = gBn;
if (err == 0 && SetDhInternal(dh) != WOLFSSL_SUCCESS) { if (SetDhInternal(dh) != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("Failed to set internal DH params."); WOLFSSL_MSG("Failed to set internal DH params.");
err = 1; err = 1;
} }
}
#endif /* OPENSSL_ALL || OPENSSL_VERSION_NUMBER >= 0x10100000L */ #endif /* OPENSSL_ALL || OPENSSL_VERSION_NUMBER >= 0x10100000L */
if (err == 1) { if (err == 1) {
@@ -26553,7 +26554,6 @@ WOLFSSL_DH* wolSSL_DH_new_by_nid(int nid)
/* FIPS v2 and lower doesn't support wc_DhSetNamedKey. */ /* FIPS v2 and lower doesn't support wc_DhSetNamedKey. */
#elif !defined(HAVE_PUBLIC_FFDHE) && (!defined(HAVE_FIPS) || \ #elif !defined(HAVE_PUBLIC_FFDHE) && (!defined(HAVE_FIPS) || \
FIPS_VERSION_GT(2,0)) FIPS_VERSION_GT(2,0))
if (err == 0) {
switch (nid) { switch (nid) {
#ifdef HAVE_FFDHE_2048 #ifdef HAVE_FFDHE_2048
case NID_ffdhe2048: case NID_ffdhe2048:
@@ -26575,6 +26575,12 @@ WOLFSSL_DH* wolSSL_DH_new_by_nid(int nid)
WOLFSSL_MSG("Unable to find DH params for nid."); WOLFSSL_MSG("Unable to find DH params for nid.");
break; break;
} }
if (err == 0) {
dh = wolfSSL_DH_new();
if (dh == NULL) {
WOLFSSL_MSG("Failed to create WOLFSSL_DH.");
err = 1;
}
} }
if (err == 0 && wc_DhSetNamedKey((DhKey*)dh->internal, name) != 0) { if (err == 0 && wc_DhSetNamedKey((DhKey*)dh->internal, name) != 0) {
WOLFSSL_MSG("wc_DhSetNamedKey failed."); WOLFSSL_MSG("wc_DhSetNamedKey failed.");
@@ -26594,6 +26600,8 @@ WOLFSSL_DH* wolSSL_DH_new_by_nid(int nid)
dh = NULL; dh = NULL;
} }
WOLFSSL_LEAVE("wolfSSL_DH_new_by_nid", err);
return dh; return dh;
} }