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

Fix double free with ./configure --enable-asynccrypt --enable-smallstack.

Browse Source
This commit is contained in:
David Garske
2018-12-21 15:45:33 -08:00
parent 3e31115654
commit 61757c83eb
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; int err;
mp_int *r = NULL, *s = NULL; mp_int *r = NULL, *s = NULL;
#ifndef WOLFSSL_ASYNC_CRYPT #if !defined(WOLFSSL_ASYNC_CRYPT) && !defined(WOLFSSL_SMALL_STACK)
#ifndef WOLFSSL_SMALL_STACK
mp_int r_lcl[1], s_lcl[1]; mp_int r_lcl[1], s_lcl[1];
#endif
#endif #endif
if (sig == NULL || hash == NULL || res == NULL || key == NULL) { 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)); XMEMSET(s, 0, sizeof(mp_int));
#endif /* WOLFSSL_ASYNC_CRYPT */ #endif /* WOLFSSL_ASYNC_CRYPT */
switch(key->state) { switch (key->state) {
case ECC_STATE_NONE: case ECC_STATE_NONE:
case ECC_STATE_VERIFY_DECODE: case ECC_STATE_VERIFY_DECODE:
key->state = 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 */ /* cleanup */
#ifdef WOLFSSL_ASYNC_CRYPT #ifdef WOLFSSL_ASYNC_CRYPT
wc_ecc_free_async(key); 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 #endif
key->state = ECC_STATE_NONE;
#ifdef WOLFSSL_SMALL_STACK key->state = ECC_STATE_NONE;
if (err != WC_PENDING_E) {
XFREE(s, key->heap, DYNAMIC_TYPE_ECC);
XFREE(r, key->heap, DYNAMIC_TYPE_ECC);
r = NULL;
s = NULL;
}
#endif
return err; return err;
} }