mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix hash hrbg memory leaks

Browse Source
This commit is contained in:
toddouska 2014-12-04 11:24:38 -08:00
parent 7fbf8359e2
commit 53cb50761d
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctaocrypt/src/pkcs7.c
View File

@ -1442,7 +1442,7 @@ int PKCS7_EncodeEnvelopedData(PKCS7* pkcs7, byte* output, word32 outputSz)
XMEMCPY(output + idx, encryptedContent, desOutSz);
idx += desOutSz;
#ifdef NO_RC4
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
FreeRng(&rng);
#endif

8
ctaocrypt/test/test.c
View File

@ -4704,6 +4704,10 @@ int ecc_test(void)
ecc_free(&userB);
ecc_free(&userA);
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
FreeRng(&rng);
#endif
return 0;
}
@ -5267,6 +5271,10 @@ int pkcs7signed_test(void)
free(out);
PKCS7_Free(&msg);
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
FreeRng(&rng);
#endif
if (ret > 0)
return 0;

11
src/ssl.c
View File

@ -10263,6 +10263,7 @@ int CyaSSL_RAND_seed(const void* seed, int len)
int CyaSSL_RAND_bytes(unsigned char* buf, int num)
{
int ret = 0;
int initTmpRng = 0;
RNG* rng = NULL;
#ifdef CYASSL_SMALL_STACK
RNG* tmpRNG = NULL;
@ -10278,8 +10279,10 @@ int CyaSSL_RAND_bytes(unsigned char* buf, int num)
return ret;
#endif
if (InitRng(tmpRNG) == 0)
if (InitRng(tmpRNG) == 0) {
rng = tmpRNG;
initTmpRng = 1;
}
else if (initGlobalRNG)
rng = &globalRNG;
@ -10290,6 +10293,12 @@ int CyaSSL_RAND_bytes(unsigned char* buf, int num)
ret = SSL_SUCCESS;
}
if (initTmpRng) {
#if defined(HAVE_HASHDRBG) || defined(NO_RC4)
FreeRng(tmpRNG);
#endif
}
#ifdef CYASSL_SMALL_STACK
XFREE(tmpRNG, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif