WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5303 from SparkiDev/match_dyn_type_fix_1 

Fix mismatched dynamic types
pull/5306/head
David Garske 2022-06-30 08:56:43 -07:00 committed by GitHub
parent e8e35c9a92 1ba9ea9759
commit ed1fdc410e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/crl.c
View File

@ -143,9 +143,9 @@ static void FreeCRL_Entry(CRL_Entry* crle, void* heap)
tmp = next;
}
if (crle->signature != NULL)
XFREE(crle->signature, heap, DYNAMIC_TYPE_REVOKED);
XFREE(crle->signature, heap, DYNAMIC_TYPE_CRL_ENTRY);
if (crle->toBeSigned != NULL)
XFREE(crle->toBeSigned, heap, DYNAMIC_TYPE_REVOKED);
XFREE(crle->toBeSigned, heap, DYNAMIC_TYPE_CRL_ENTRY);
(void)heap;
}

4
src/internal.c
View File

@ -11806,13 +11806,13 @@ int DoVerifyCallback(WOLFSSL_CERT_MANAGER* cm, WOLFSSL* ssl, int ret,
x509 = (WOLFSSL_X509*)XMALLOC(sizeof(WOLFSSL_X509), heap,
DYNAMIC_TYPE_X509);
if (x509 == NULL) {
XFREE(store, heap, DYNAMIC_TYPE_X509);
XFREE(store, heap, DYNAMIC_TYPE_X509_STORE);
return MEMORY_E;
}
#endif
domain = (char*)XMALLOC(ASN_NAME_MAX, heap, DYNAMIC_TYPE_STRING);
if (domain == NULL) {
XFREE(store, heap, DYNAMIC_TYPE_X509);
XFREE(store, heap, DYNAMIC_TYPE_X509_STORE);
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)
XFREE(x509, heap, DYNAMIC_TYPE_X509);
#endif

8
src/pk.c
View File

@ -1565,7 +1565,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher,
DYNAMIC_TYPE_TMP_BUFFER);
if (tmpBuf == NULL) {
WOLFSSL_MSG("Extending DER buffer failed");
XFREE(derBuf, NULL, DYNAMIC_TYPE_DER);
XFREE(derBuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
ret = 0;
}
else {
@ -1616,7 +1616,7 @@ int wolfSSL_PEM_write_mem_RSAPrivateKey(RSA* rsa, const EVP_CIPHER* cipher,
XFREE(tmp, NULL, DYNAMIC_TYPE_KEY);
XFREE(cipherInfo, NULL, DYNAMIC_TYPE_STRING);
XFREE(derBuf, rsa->heap, DYNAMIC_TYPE_DER);
XFREE(derBuf, rsa->heap, DYNAMIC_TYPE_TMP_BUFFER);
return ret;
}
@ -5151,7 +5151,7 @@ int wolfSSL_PEM_write_bio_DSAPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_DSA* dsa,
derSz = wc_DsaKeyToDer((DsaKey*)dsa->internal, derBuf, der_max_len);
if (derSz < 0) {
WOLFSSL_MSG("wc_DsaKeyToDer failed");
XFREE(derBuf, NULL, DYNAMIC_TYPE_DER);
XFREE(derBuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
wolfSSL_EVP_PKEY_free(pkey);
return 0;
}
@ -10765,7 +10765,7 @@ int wolfSSL_PEM_write_bio_ECPrivateKey(WOLFSSL_BIO* bio, WOLFSSL_EC_KEY* ec,
derSz = wc_EccKeyToDer((ecc_key*)ec->internal, derBuf, der_max_len);
if (derSz < 0) {
WOLFSSL_MSG("wc_EccKeyToDer failed");
XFREE(derBuf, NULL, DYNAMIC_TYPE_DER);
XFREE(derBuf, NULL, DYNAMIC_TYPE_TMP_BUFFER);
wolfSSL_EVP_PKEY_free(pkey);
return 0;
}

4
src/ssl.c
View File

@ -19512,7 +19512,7 @@ WOLFSSL_SESSION* wolfSSL_NewSession(void* heap)
if (wolfSSL_SESSION_set_ex_data(ret, 0, (void *)(-1))
!= WOLFSSL_SUCCESS) {
WOLFSSL_MSG("Error setting up ex data for stunnel");
XFREE(ret, NULL, DYNAMIC_TYPE_OPENSSL);
XFREE(ret, NULL, DYNAMIC_TYPE_SESSION);
return NULL;
}
#endif
@ -35512,7 +35512,7 @@ char *wolfSSL_BN_bn2dec(const WOLFSSL_BIGNUM *bn)
}
if (mp_todecimal((mp_int*)bn->internal, buf) != MP_OKAY) {
XFREE(buf, NULL, DYNAMIC_TYPE_ECC);
XFREE(buf, NULL, DYNAMIC_TYPE_OPENSSL);
return NULL;
}

2
src/x509_str.c
View File

@ -1071,7 +1071,7 @@ WOLFSSL_API int wolfSSL_X509_STORE_load_locations(WOLFSSL_X509_STORE *str,
}
#ifdef WOLFSSL_SMALL_STACK
XFREE(readCtx, ctx->heap, DYNAMIC_TYPE_DIRCTX);
XFREE(readCtx, ctx->heap, DYNAMIC_TYPE_TMP_BUFFER);
#endif
}