wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2329 from JacobBarthelmeh/SanityChecks

Browse Source 
scan-build fixes
This commit is contained in:
toddouska
2019-07-10 10:23:39 -07:00
committed by GitHub
parent 9cd6a992c5 efe276414b
commit 92bd585f25
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/internal.c
View File

@@ -3113,8 +3113,10 @@ void InitX509Name(WOLFSSL_X509_NAME* name, int dynamicFlag)
void FreeX509Name(WOLFSSL_X509_NAME* name, void* heap) void FreeX509Name(WOLFSSL_X509_NAME* name, void* heap)
{ {
if (name != NULL) { if (name != NULL) {
if (name->dynamicName) if (name->dynamicName) {
XFREE(name->name, heap, DYNAMIC_TYPE_SUBJECT_CN); XFREE(name->name, heap, DYNAMIC_TYPE_SUBJECT_CN);
name->name = NULL;
}
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL) #if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)
{ {
int i; int i;
@@ -3161,22 +3163,31 @@ void FreeX509(WOLFSSL_X509* x509)
FreeX509Name(&x509->issuer, x509->heap); FreeX509Name(&x509->issuer, x509->heap);
FreeX509Name(&x509->subject, x509->heap); FreeX509Name(&x509->subject, x509->heap);
if (x509->pubKey.buffer) if (x509->pubKey.buffer) {
XFREE(x509->pubKey.buffer, x509->heap, DYNAMIC_TYPE_PUBLIC_KEY); XFREE(x509->pubKey.buffer, x509->heap, DYNAMIC_TYPE_PUBLIC_KEY);
x509->pubKey.buffer = NULL;
}
FreeDer(&x509->derCert); FreeDer(&x509->derCert);
XFREE(x509->sig.buffer, x509->heap, DYNAMIC_TYPE_SIGNATURE); XFREE(x509->sig.buffer, x509->heap, DYNAMIC_TYPE_SIGNATURE);
x509->sig.buffer = NULL;
#if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL) #if defined(OPENSSL_EXTRA) || defined(OPENSSL_EXTRA_X509_SMALL)
XFREE(x509->authKeyId, x509->heap, DYNAMIC_TYPE_X509_EXT); XFREE(x509->authKeyId, x509->heap, DYNAMIC_TYPE_X509_EXT);
x509->authKeyId = NULL;
XFREE(x509->subjKeyId, x509->heap, DYNAMIC_TYPE_X509_EXT); XFREE(x509->subjKeyId, x509->heap, DYNAMIC_TYPE_X509_EXT);
x509->subjKeyId = NULL;
if (x509->authInfo != NULL) { if (x509->authInfo != NULL) {
XFREE(x509->authInfo, x509->heap, DYNAMIC_TYPE_X509_EXT); XFREE(x509->authInfo, x509->heap, DYNAMIC_TYPE_X509_EXT);
x509->authInfo = NULL;
} }
if (x509->extKeyUsageSrc != NULL) { if (x509->extKeyUsageSrc != NULL) {
XFREE(x509->extKeyUsageSrc, x509->heap, DYNAMIC_TYPE_X509_EXT); XFREE(x509->extKeyUsageSrc, x509->heap, DYNAMIC_TYPE_X509_EXT);
x509->extKeyUsageSrc= NULL;
} }
#endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */ #endif /* OPENSSL_EXTRA || OPENSSL_EXTRA_X509_SMALL */
if (x509->altNames) if (x509->altNames) {
FreeAltNames(x509->altNames, x509->heap); FreeAltNames(x509->altNames, x509->heap);
x509->altNames = NULL;
}
} }
@@ -9023,6 +9034,9 @@ static int DoVerifyCallback(WOLFSSL* ssl, int ret, ProcPeerCertArgs* args)
if (CopyDecodedToX509(x509, args->dCert) == 0) { if (CopyDecodedToX509(x509, args->dCert) == 0) {
store->current_cert = x509; store->current_cert = x509;
} }
else {
FreeX509(x509);
}
} }
#endif #endif
#ifdef SESSION_CERTS #ifdef SESSION_CERTS
@@ -9531,6 +9545,7 @@ int ProcessPeerCerts(WOLFSSL* ssl, byte* input, word32* inOutIdx,
if (args->dCert == NULL) { if (args->dCert == NULL) {
ERROR_OUT(MEMORY_E, exit_ppc); ERROR_OUT(MEMORY_E, exit_ppc);
} }
XMEMSET(args->dCert, 0, sizeof(DecodedCert));
#endif #endif
/* Advance state and proceed */ /* Advance state and proceed */

2
wolfcrypt/src/pkcs7.c
View File

@@ -11120,6 +11120,7 @@ int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz,
} }
/* decrypt encryptedContent */ /* decrypt encryptedContent */
if (ret == 0) {
ret = wc_PKCS7_DecryptContent(encOID, pkcs7->encryptionKey, ret = wc_PKCS7_DecryptContent(encOID, pkcs7->encryptionKey,
pkcs7->encryptionKeySz, tmpIv, expBlockSz, pkcs7->encryptionKeySz, tmpIv, expBlockSz,
NULL, 0, NULL, 0, encryptedContent, NULL, 0, NULL, 0, encryptedContent,
@@ -11127,6 +11128,7 @@ int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz,
if (ret != 0) { if (ret != 0) {
XFREE(encryptedContent, pkcs7->heap, DYNAMIC_TYPE_PKCS7); XFREE(encryptedContent, pkcs7->heap, DYNAMIC_TYPE_PKCS7);
} }
}
if (ret == 0) { if (ret == 0) {
padLen = encryptedContent[encryptedContentSz-1]; padLen = encryptedContent[encryptedContentSz-1];