Various scan-build fixes.

This commit is contained in:
David Garske
2022-04-21 14:44:23 -07:00
parent 3755b88a02
commit 84a33183a6
4 changed files with 13 additions and 11 deletions

View File

@@ -2069,7 +2069,6 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
(void)resumeScr; (void)resumeScr;
(void)ourKey; (void)ourKey;
(void)ourCert; (void)ourCert;
(void)customVerifyCert;
(void)verifyCert; (void)verifyCert;
(void)useClientCert; (void)useClientCert;
(void)disableCRL; (void)disableCRL;
@@ -3898,7 +3897,6 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
if (ret == WOLFSSL_SUCCESS) { if (ret == WOLFSSL_SUCCESS) {
printf("NON-BLOCKING RENEGOTIATION SUCCESSFUL\n"); printf("NON-BLOCKING RENEGOTIATION SUCCESSFUL\n");
err = 0;
} }
} }
if (ret != WOLFSSL_SUCCESS) { if (ret != WOLFSSL_SUCCESS) {
@@ -4342,6 +4340,7 @@ exit:
(void) ourCert; (void) ourCert;
(void) ourKey; (void) ourKey;
(void) useVerifyCb; (void) useVerifyCb;
(void) customVerifyCert;
#if !defined(WOLFSSL_TIRTOS) #if !defined(WOLFSSL_TIRTOS)
return 0; return 0;

View File

@@ -10741,13 +10741,17 @@ int CopyDecodedToX509(WOLFSSL_X509* x509, DecodedCert* dCert)
#endif #endif
} }
/* store cert for potential retrieval */ /* if der contains original source buffer then store for potential
if (AllocDer(&x509->derCert, dCert->maxIdx, CERT_TYPE, x509->heap) == 0) { * retrieval */
if (dCert->source != NULL && dCert->maxIdx > 0) {
if (AllocDer(&x509->derCert, dCert->maxIdx, CERT_TYPE, x509->heap)
== 0) {
XMEMCPY(x509->derCert->buffer, dCert->source, dCert->maxIdx); XMEMCPY(x509->derCert->buffer, dCert->source, dCert->maxIdx);
} }
else { else {
ret = MEMORY_E; ret = MEMORY_E;
} }
}
x509->altNames = dCert->altNames; x509->altNames = dCert->altNames;
dCert->weOwnAltNames = 0; dCert->weOwnAltNames = 0;

View File

@@ -7600,7 +7600,6 @@ int wolfSSL_CTX_load_verify_locations_ex(WOLFSSL_CTX* ctx, const char* file,
if (ret != WOLFSSL_SUCCESS) { if (ret != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("wolfSSL_CTX_trust_peer_cert error. Ignoring" WOLFSSL_MSG("wolfSSL_CTX_trust_peer_cert error. Ignoring"
"this error."); "this error.");
ret = WOLFSSL_SUCCESS;
} }
#endif #endif
successCount++; successCount++;

View File

@@ -16674,11 +16674,11 @@ WOLFSSL_TEST_SUBROUTINE int dh_test(void)
#ifdef HAVE_FFDHE_4096 #ifdef HAVE_FFDHE_4096
#ifdef HAVE_PUBLIC_FFDHE #ifdef HAVE_PUBLIC_FFDHE
ret = dh_ffdhe_test(&rng, wc_Dh_ffdhe4096_Get()); ret = dh_ffdhe_test(&rng, wc_Dh_ffdhe4096_Get());
if (ret != 0)
ERROR_OUT(-8128, done);
#else #else
ret = dh_ffdhe_test(&rng, WC_FFDHE_4096); ret = dh_ffdhe_test(&rng, WC_FFDHE_4096);
#endif #endif
if (ret != 0)
ERROR_OUT(-8128, done);
#endif #endif
#endif /* !WC_NO_RNG */ #endif /* !WC_NO_RNG */
#endif /* HAVE_FIPS_VERSION == 2 && !WOLFSSL_SP_ARM64_ASM */ #endif /* HAVE_FIPS_VERSION == 2 && !WOLFSSL_SP_ARM64_ASM */