Merge pull request #10482 from rlm2002/coverity

13052026 Coverity Fixes
This commit is contained in:
David Garske
2026-05-18 10:35:42 -07:00
committed by GitHub
5 changed files with 21 additions and 35 deletions
+4 -12
View File
@@ -10154,18 +10154,10 @@ size_t wolfSSL_get_client_random(const WOLFSSL* ssl, unsigned char* out,
#endif
#ifdef WOLFSSL_TLS13
#if defined(HAVE_SESSION_TICKET) || !defined(NO_PSK)
if (ssl->ctx != NULL) {
ssl->options.noPskDheKe = ssl->ctx->noPskDheKe;
#ifdef HAVE_SUPPORTED_CURVES
ssl->options.onlyPskDheKe = ssl->ctx->onlyPskDheKe;
#endif
}
else {
ssl->options.noPskDheKe = 0;
#ifdef HAVE_SUPPORTED_CURVES
ssl->options.onlyPskDheKe = 0;
#endif
}
ssl->options.noPskDheKe = ssl->ctx->noPskDheKe;
#ifdef HAVE_SUPPORTED_CURVES
ssl->options.onlyPskDheKe = ssl->ctx->onlyPskDheKe;
#endif
#endif
#endif
#ifdef HAVE_SESSION_TICKET
+16 -14
View File
@@ -23976,21 +23976,23 @@ static int test_ParseSerial0FixtureMatrix(void)
ExpectIntGE(derSz = wc_CertPemToDer(pemBuf, (int)pemSz, derBuf,
(int)pemSz, CERT_TYPE), 0);
wc_InitDecodedCert(&dc, derBuf, (word32)derSz, NULL);
ret = wc_ParseCert(&dc, CERT_TYPE, NO_VERIFY, NULL);
if (cases[i].certTypeShouldPass)
ExpectIntEQ(ret, 0);
else
ExpectIntNE(ret, 0);
wc_FreeDecodedCert(&dc);
if (EXPECT_SUCCESS()) {
wc_InitDecodedCert(&dc, derBuf, (word32)derSz, NULL);
ret = wc_ParseCert(&dc, CERT_TYPE, NO_VERIFY, NULL);
if (cases[i].certTypeShouldPass)
ExpectIntEQ(ret, 0);
else
ExpectIntNE(ret, 0);
wc_FreeDecodedCert(&dc);
wc_InitDecodedCert(&dc, derBuf, (word32)derSz, NULL);
ret = wc_ParseCert(&dc, CA_TYPE, NO_VERIFY, NULL);
if (cases[i].caTypeShouldPass)
ExpectIntEQ(ret, 0);
else
ExpectIntNE(ret, 0);
wc_FreeDecodedCert(&dc);
wc_InitDecodedCert(&dc, derBuf, (word32)derSz, NULL);
ret = wc_ParseCert(&dc, CA_TYPE, NO_VERIFY, NULL);
if (cases[i].caTypeShouldPass)
ExpectIntEQ(ret, 0);
else
ExpectIntNE(ret, 0);
wc_FreeDecodedCert(&dc);
}
XFREE(derBuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(pemBuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
-3
View File
@@ -268,9 +268,6 @@ static WC_INLINE int test_pkcs8_get_version_byte(const byte* der, word32 derSz)
if (der[idx++] != 0x30) {
return -1;
}
if (idx >= derSz) {
return -1;
}
if ((der[idx] & 0x80) == 0) {
/* short-form length */
idx += 1;
+1
View File
@@ -126,6 +126,7 @@ int test_wc_CamelliaFree(void)
byte zero[sizeof(camellia)];
XMEMSET(zero, 0, sizeof(zero));
XMEMSET(&camellia, 0, sizeof(camellia));
/* NULL is safe. */
wc_CamelliaFree(NULL);
-6
View File
@@ -31359,9 +31359,6 @@ static wc_test_ret_t openssl_aes_cbc_test(void)
return WC_TEST_RET_ENC_NC;
if (outlen != 16)
return WC_TEST_RET_ENC_NC;
total += outlen;
if (total != 32)
return 3408;
wolfSSL_EVP_CIPHER_CTX_cleanup(en);
@@ -31428,9 +31425,6 @@ static wc_test_ret_t openssl_aes_cbc_test(void)
return WC_TEST_RET_ENC_NC;
if (outlen != 16)
return WC_TEST_RET_ENC_NC;
total += outlen;
if (total != 32)
return WC_TEST_RET_ENC_NC;
wolfSSL_EVP_CIPHER_CTX_cleanup(en);