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

Long Test Fixes

Browse Source 
1. Sniffer was trying to log a NULL pointer as a string. Logged a string instead.
2. Few misc fixes in ECC.
This commit is contained in:
John Safranek
2020-08-18 17:06:57 -07:00
parent 6e49a63e50
commit 113753370d
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sniffer.c
View File

@@ -1737,7 +1737,7 @@ int ssl_SetPrivateKeyBuffer(const char* address, int port,
int ret; int ret;
TraceHeader(); TraceHeader();
TraceSetServer(address, port, NULL); TraceSetServer(address, port, "from buffer");
wc_LockMutex(&ServerListMutex); wc_LockMutex(&ServerListMutex);
ret = SetNamedPrivateKey(NULL, address, port, keyBuf, keySz, ret = SetNamedPrivateKey(NULL, address, port, keyBuf, keySz,
@@ -1826,7 +1826,7 @@ int ssl_SetEphemeralKeyBuffer(const char* address, int port,
int ret; int ret;
TraceHeader(); TraceHeader();
TraceSetServer(address, port, NULL); TraceSetServer(address, port, "from buffer");
wc_LockMutex(&ServerListMutex); wc_LockMutex(&ServerListMutex);
ret = SetNamedPrivateKey(NULL, address, port, keyBuf, keySz, ret = SetNamedPrivateKey(NULL, address, port, keyBuf, keySz,

9
wolfcrypt/src/ecc.c
View File

@@ -2843,7 +2843,7 @@ static int ecc_key_tmp_init(ecc_key* key, void* heap)
{ {
int err = MP_OKAY; int err = MP_OKAY;
XMEMSET(*key, 0, sizeof(key)); XMEMSET(key, 0, sizeof(*key));
key->t1 = (mp_int*)XMALLOC(sizeof(mp_int), heap, DYNAMIC_TYPE_ECC); key->t1 = (mp_int*)XMALLOC(sizeof(mp_int), heap, DYNAMIC_TYPE_ECC);
key->t2 = (mp_int*)XMALLOC(sizeof(mp_int), heap, DYNAMIC_TYPE_ECC); key->t2 = (mp_int*)XMALLOC(sizeof(mp_int), heap, DYNAMIC_TYPE_ECC);
@@ -2865,6 +2865,7 @@ static int ecc_key_tmp_init(ecc_key* key, void* heap)
static void ecc_key_tmp_final(ecc_key* key, void* heap) static void ecc_key_tmp_final(ecc_key* key, void* heap)
{ {
(void)heap;
#ifdef ALT_ECC_SIZE #ifdef ALT_ECC_SIZE
if (key->z != NULL) if (key->z != NULL)
XFREE(key->z, heap, DYNAMIC_TYPE_ECC); XFREE(key->z, heap, DYNAMIC_TYPE_ECC);
@@ -2875,7 +2876,7 @@ static void ecc_key_tmp_final(ecc_key* key, void* heap)
#endif #endif
if (key->t2 != NULL) if (key->t2 != NULL)
XFREE(key->t2, heap, DYNAMIC_TYPE_ECC); XFREE(key->t2, heap, DYNAMIC_TYPE_ECC);
if (key.t1 != NULL) if (key->t1 != NULL)
XFREE(key->t1, heap, DYNAMIC_TYPE_ECC); XFREE(key->t1, heap, DYNAMIC_TYPE_ECC);
} }
#endif /* WOLFSSL_SMALL_STACK_CACHE */ #endif /* WOLFSSL_SMALL_STACK_CACHE */
@@ -2969,7 +2970,7 @@ exit:
} }
#ifdef WOLFSSL_SMALL_STACK_CACHE #ifdef WOLFSSL_SMALL_STACK_CACHE
R->key = NULL; R->key = NULL;
ecc_key_tmp_free(&key, heap); ecc_key_tmp_final(&key, heap);
#endif /* WOLFSSL_SMALL_STACK_CACHE */ #endif /* WOLFSSL_SMALL_STACK_CACHE */
return err; return err;
@@ -3123,7 +3124,7 @@ exit:
} }
#ifdef WOLFSSL_SMALL_STACK_CACHE #ifdef WOLFSSL_SMALL_STACK_CACHE
R->key = NULL; R->key = NULL;
ecc_key_tmp_free(&key, heap); ecc_key_tmp_final(&key, heap);
#endif /* WOLFSSL_SMALL_STACK_CACHE */ #endif /* WOLFSSL_SMALL_STACK_CACHE */
return err; return err;