feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Fix for memory cleanup cases in MakeTlsMasterSecret.

Browse Source
This commit is contained in:
David Garske
2018-10-15 13:22:55 -07:00
parent a0608151cf
commit 7c3313481a
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/tls.c
View File

@@ -283,12 +283,15 @@ static int doPRF(byte* digest, word32 digLen, const byte* secret,word32 secLen,
byte labelSeed[MAX_PRF_LABSEED]; byte labelSeed[MAX_PRF_LABSEED];
#endif #endif
if (half > MAX_PRF_HALF) if (half > MAX_PRF_HALF ||
return BUFFER_E; labLen + seedLen > MAX_PRF_LABSEED ||
if (labLen + seedLen > MAX_PRF_LABSEED) digLen > MAX_PRF_DIG)
return BUFFER_E; {
if (digLen > MAX_PRF_DIG) #if defined(WOLFSSL_ASYNC_CRYPT) && !defined(WC_ASYNC_NO_HASH)
FREE_VAR(labelSeed, heap);
#endif
return BUFFER_E; return BUFFER_E;
}
#ifdef WOLFSSL_SMALL_STACK #ifdef WOLFSSL_SMALL_STACK
md5_half = (byte*)XMALLOC(MAX_PRF_HALF, heap, DYNAMIC_TYPE_DIGEST); md5_half = (byte*)XMALLOC(MAX_PRF_HALF, heap, DYNAMIC_TYPE_DIGEST);
@@ -302,7 +305,9 @@ static int doPRF(byte* digest, word32 digLen, const byte* secret,word32 secLen,
if (sha_half) XFREE(sha_half, heap, DYNAMIC_TYPE_DIGEST); if (sha_half) XFREE(sha_half, heap, DYNAMIC_TYPE_DIGEST);
if (md5_result) XFREE(md5_result, heap, DYNAMIC_TYPE_DIGEST); if (md5_result) XFREE(md5_result, heap, DYNAMIC_TYPE_DIGEST);
if (sha_result) XFREE(sha_result, heap, DYNAMIC_TYPE_DIGEST); if (sha_result) XFREE(sha_result, heap, DYNAMIC_TYPE_DIGEST);
#if defined(WOLFSSL_ASYNC_CRYPT) && !defined(WC_ASYNC_NO_HASH)
FREE_VAR(labelSeed, heap); FREE_VAR(labelSeed, heap);
#endif
return MEMORY_E; return MEMORY_E;
} }