From 113753370d08dcda30aaabc173638ac054fa0631 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Tue, 18 Aug 2020 17:06:57 -0700 Subject: [PATCH] Long Test Fixes 1. Sniffer was trying to log a NULL pointer as a string. Logged a string instead. 2. Few misc fixes in ECC. --- src/sniffer.c | 4 ++-- wolfcrypt/src/ecc.c | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/sniffer.c b/src/sniffer.c index 1e802486d..37353df26 100644 --- a/src/sniffer.c +++ b/src/sniffer.c @@ -1737,7 +1737,7 @@ int ssl_SetPrivateKeyBuffer(const char* address, int port, int ret; TraceHeader(); - TraceSetServer(address, port, NULL); + TraceSetServer(address, port, "from buffer"); wc_LockMutex(&ServerListMutex); ret = SetNamedPrivateKey(NULL, address, port, keyBuf, keySz, @@ -1826,7 +1826,7 @@ int ssl_SetEphemeralKeyBuffer(const char* address, int port, int ret; TraceHeader(); - TraceSetServer(address, port, NULL); + TraceSetServer(address, port, "from buffer"); wc_LockMutex(&ServerListMutex); ret = SetNamedPrivateKey(NULL, address, port, keyBuf, keySz, diff --git a/wolfcrypt/src/ecc.c b/wolfcrypt/src/ecc.c index 5b203e13b..72a90e306 100644 --- a/wolfcrypt/src/ecc.c +++ b/wolfcrypt/src/ecc.c @@ -2843,7 +2843,7 @@ static int ecc_key_tmp_init(ecc_key* key, void* heap) { 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->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) { + (void)heap; #ifdef ALT_ECC_SIZE if (key->z != NULL) XFREE(key->z, heap, DYNAMIC_TYPE_ECC); @@ -2875,7 +2876,7 @@ static void ecc_key_tmp_final(ecc_key* key, void* heap) #endif if (key->t2 != NULL) XFREE(key->t2, heap, DYNAMIC_TYPE_ECC); - if (key.t1 != NULL) + if (key->t1 != NULL) XFREE(key->t1, heap, DYNAMIC_TYPE_ECC); } #endif /* WOLFSSL_SMALL_STACK_CACHE */ @@ -2969,7 +2970,7 @@ exit: } #ifdef WOLFSSL_SMALL_STACK_CACHE R->key = NULL; - ecc_key_tmp_free(&key, heap); + ecc_key_tmp_final(&key, heap); #endif /* WOLFSSL_SMALL_STACK_CACHE */ return err; @@ -3123,7 +3124,7 @@ exit: } #ifdef WOLFSSL_SMALL_STACK_CACHE R->key = NULL; - ecc_key_tmp_free(&key, heap); + ecc_key_tmp_final(&key, heap); #endif /* WOLFSSL_SMALL_STACK_CACHE */ return err;