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

Merge branch 'fix/RA/v4.7.0-coverity' of https://github.com/DKubasekRA/wolfssl into fix/RA/v4.7.0-coverity

Browse Source
This commit is contained in:
Martin Kinčl
2021-03-03 18:49:06 +01:00
parent 1aa718a438 061120dda6
commit b47678513a
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/crl.c
View File

@ -633,6 +633,7 @@ static CRL_Entry* DupCRL_list(CRL_Entry* crl, void* heap)
current = head; current = head;
head = head->next; head = head->next;
FreeCRL_Entry(current, heap); FreeCRL_Entry(current, heap);
XFREE(current, heap, DYNAMIC_TYPE_CRL_ENTRY);
} }
return NULL; return NULL;

3
src/ocsp.c
View File

@ -621,6 +621,7 @@ WOLFSSL_OCSP_CERTID* wolfSSL_OCSP_cert_to_id(
if (certStatus) if (certStatus)
XFREE(certStatus, NULL, DYNAMIC_TYPE_OPENSSL); XFREE(certStatus, NULL, DYNAMIC_TYPE_OPENSSL);
wolfSSL_CertManagerFree(cm);
return NULL; return NULL;
} }
@ -799,8 +800,8 @@ OcspResponse* wolfSSL_d2i_OCSP_RESPONSE(OcspResponse** response,
DYNAMIC_TYPE_OCSP_STATUS); DYNAMIC_TYPE_OCSP_STATUS);
if (resp->single->status == NULL) { if (resp->single->status == NULL) {
XFREE(resp->source, NULL, DYNAMIC_TYPE_TMP_BUFFER); XFREE(resp->source, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(resp, NULL, DYNAMIC_TYPE_OCSP_REQUEST);
XFREE(resp->single, NULL, DYNAMIC_TYPE_OCSP_ENTRY); XFREE(resp->single, NULL, DYNAMIC_TYPE_OCSP_ENTRY);
XFREE(resp, NULL, DYNAMIC_TYPE_OCSP_REQUEST);
return NULL; return NULL;
} }
XMEMSET(resp->single->status, 0, sizeof(CertStatus)); XMEMSET(resp->single->status, 0, sizeof(CertStatus));

23
src/ssl.c
View File

@ -8171,6 +8171,7 @@ int wolfSSL_X509_get_ext_count(const WOLFSSL_X509* passedCert)
CA_TYPE, CA_TYPE,
NO_VERIFY, NULL) < 0) { NO_VERIFY, NULL) < 0) {
WOLFSSL_MSG("\tCertificate parsing failed"); WOLFSSL_MSG("\tCertificate parsing failed");
FreeDecodedCert(&cert);
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@ -9475,6 +9476,7 @@ void* wolfSSL_X509V3_EXT_d2i(WOLFSSL_X509_EXTENSION* ext)
WOLFSSL_MSG("ASN1_STRING_set() failed"); WOLFSSL_MSG("ASN1_STRING_set() failed");
wolfSSL_ASN1_OBJECT_free(ad->method); wolfSSL_ASN1_OBJECT_free(ad->method);
XFREE(aia, NULL, DYNAMIC_TYPE_X509_EXT); XFREE(aia, NULL, DYNAMIC_TYPE_X509_EXT);
XFREE(ad->location, NULL, DYNAMIC_TYPE_OPENSSL);
XFREE(ad, NULL, DYNAMIC_TYPE_X509_EXT); XFREE(ad, NULL, DYNAMIC_TYPE_X509_EXT);
return NULL; return NULL;
} }
@ -23674,6 +23676,7 @@ int wolfSSL_X509_cmp(const WOLFSSL_X509 *a, const WOLFSSL_X509 *b)
if (wolfSSL_BIO_set_fp(bio, fp, BIO_NOCLOSE) != WOLFSSL_SUCCESS) { if (wolfSSL_BIO_set_fp(bio, fp, BIO_NOCLOSE) != WOLFSSL_SUCCESS) {
WOLFSSL_MSG("wolfSSL_BIO_set_fp error"); WOLFSSL_MSG("wolfSSL_BIO_set_fp error");
wolfSSL_BIO_free(bio);
return WOLFSSL_FAILURE; return WOLFSSL_FAILURE;
} }
@ -41517,7 +41520,7 @@ err:
* *
* returns WOLFSSL_SUCCESS on success * returns WOLFSSL_SUCCESS on success
*/ */
static int wolfSSL_X509_INFO_set(WOLFSSL_X509_INFO* info, static int wolfSSL_X509_INFO_set(WOLFSSL_X509_INFO** info,
WOLFSSL_X509* x509) WOLFSSL_X509* x509)
{ {
if (info == NULL || x509 == NULL) { if (info == NULL || x509 == NULL) {
@ -41525,7 +41528,7 @@ err:
} }
/* check is fresh "info" passed in, if not free it */ /* check is fresh "info" passed in, if not free it */
if (info->x509 != NULL || info->x_pkey != NULL) { if ((*info)->x509 != NULL || (*info)->x_pkey != NULL) {
WOLFSSL_X509_INFO* tmp; WOLFSSL_X509_INFO* tmp;
tmp = wolfSSL_X509_INFO_new(); tmp = wolfSSL_X509_INFO_new();
@ -41533,11 +41536,11 @@ err:
WOLFSSL_MSG("Unable to create new structure"); WOLFSSL_MSG("Unable to create new structure");
return MEMORY_E; return MEMORY_E;
} }
wolfSSL_X509_INFO_free(info); wolfSSL_X509_INFO_free(*info);
info = tmp; (*info) = tmp;
} }
info->x509 = x509; (*info)->x509 = x509;
//@TODO info->num //@TODO info->num
//@TODO info->enc_cipher //@TODO info->enc_cipher
@ -41545,8 +41548,8 @@ err:
//@TODO info->enc_data //@TODO info->enc_data
//@TODO info->crl //@TODO info->crl
info->x_pkey = wolfSSL_X509_PKEY_new(x509->heap); (*info)->x_pkey = wolfSSL_X509_PKEY_new(x509->heap);
return wolfSSL_X509_PKEY_set(info->x_pkey, x509); return wolfSSL_X509_PKEY_set((*info)->x_pkey, x509);
} }
/** /**
@ -41741,7 +41744,7 @@ err:
return NULL; return NULL;
} }
if (x509) { if (x509) {
ret = wolfSSL_X509_INFO_set(current, x509); ret = wolfSSL_X509_INFO_set(&current, x509);
} }
else if (crl) { else if (crl) {
current->crl = crl; current->crl = crl;
@ -44553,6 +44556,7 @@ WOLFSSL_RSA* wolfSSL_d2i_RSAPrivateKey_bio(WOLFSSL_BIO *bio, WOLFSSL_RSA **out)
const byte* bioMemPt = bioMem; /* leave bioMem pointer unaltered */ const byte* bioMemPt = bioMem; /* leave bioMem pointer unaltered */
if ((key = wolfSSL_d2i_RSAPrivateKey(NULL, &bioMemPt, bioMemSz)) == NULL) { if ((key = wolfSSL_d2i_RSAPrivateKey(NULL, &bioMemPt, bioMemSz)) == NULL) {
XFREE((unsigned char*)bioMem, bio->heap, DYNAMIC_TYPE_TMP_BUFFER); XFREE((unsigned char*)bioMem, bio->heap, DYNAMIC_TYPE_TMP_BUFFER);
XFREE((unsigned char*)maxKeyBuf, bio->heap, DYNAMIC_TYPE_TMP_BUFFER);
return NULL; return NULL;
} }
@ -49982,6 +49986,9 @@ WOLFSSL_BIGNUM* wolfSSL_BN_bin2bn(const unsigned char* str, int len,
return NULL; return NULL;
} }
} else { } else {
/* This may be overly defensive */
if (weOwn)
wolfSSL_BN_free(ret);
return NULL; return NULL;
} }