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

Merge pull request #1998 from dgarske/async_fix_smallstack

Browse Source 
Fix double free with async and small stack
This commit is contained in:
toddouska
2018-12-26 14:35:57 -08:00
committed by GitHub
parent a7350b7d2e 61757c83eb
commit 9c88218b62
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wolfcrypt/src/ecc.c
View File

@@ -5144,10 +5144,8 @@ int wc_ecc_verify_hash(const byte* sig, word32 siglen, const byte* hash,
{
int err;
mp_int *r = NULL, *s = NULL;
#ifndef WOLFSSL_ASYNC_CRYPT
#ifndef WOLFSSL_SMALL_STACK
#if !defined(WOLFSSL_ASYNC_CRYPT) && !defined(WOLFSSL_SMALL_STACK)
mp_int r_lcl[1], s_lcl[1];
#endif
#endif
if (sig == NULL || hash == NULL || res == NULL || key == NULL) {
@@ -5186,7 +5184,7 @@ int wc_ecc_verify_hash(const byte* sig, word32 siglen, const byte* hash,
XMEMSET(s, 0, sizeof(mp_int));
#endif /* WOLFSSL_ASYNC_CRYPT */
switch(key->state) {
switch (key->state) {
case ECC_STATE_NONE:
case ECC_STATE_VERIFY_DECODE:
key->state = ECC_STATE_VERIFY_DECODE;
@@ -5245,17 +5243,14 @@ int wc_ecc_verify_hash(const byte* sig, word32 siglen, const byte* hash,
/* cleanup */
#ifdef WOLFSSL_ASYNC_CRYPT
wc_ecc_free_async(key);
#elif defined(WOLFSSL_SMALL_STACK)
XFREE(s, key->heap, DYNAMIC_TYPE_ECC);
XFREE(r, key->heap, DYNAMIC_TYPE_ECC);
r = NULL;
s = NULL;
#endif
key->state = ECC_STATE_NONE;
#ifdef WOLFSSL_SMALL_STACK
if (err != WC_PENDING_E) {
XFREE(s, key->heap, DYNAMIC_TYPE_ECC);
XFREE(r, key->heap, DYNAMIC_TYPE_ECC);
r = NULL;
s = NULL;
}
#endif
key->state = ECC_STATE_NONE;
return err;
}