From 7e5be2f3132c658245c41202f338d256c06ff6d9 Mon Sep 17 00:00:00 2001 From: Chris Conlon Date: Fri, 9 Oct 2015 10:57:55 -0600 Subject: [PATCH] fix resource cleanup in testsuite and wolfcrypt test --- src/internal.c | 2 +- testsuite/testsuite.c | 2 ++ wolfcrypt/test/test.c | 1 + wolfssl/test.h | 3 ++- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/internal.c b/src/internal.c index 5c9ede255..5090c9fbd 100644 --- a/src/internal.c +++ b/src/internal.c @@ -2577,7 +2577,7 @@ ProtocolVersion MakeDTLSv1_2(void) word32 LowResTimer(void) { - NET_SECURE_OS_TICK clk; + NET_SECURE_OS_TICK clk = 0; #if (NET_SECURE_MGR_CFG_EN == DEF_ENABLED) clk = NetSecure_OS_TimeGet(); diff --git a/testsuite/testsuite.c b/testsuite/testsuite.c index dc756377c..9f256c2c5 100644 --- a/testsuite/testsuite.c +++ b/testsuite/testsuite.c @@ -382,6 +382,7 @@ void file_test(const char* file, byte* check) ret = wc_Sha256Update(&sha256, buf, i); if (ret != 0) { printf("Can't wc_Sha256Update %d\n", ret); + fclose(f); return; } } @@ -389,6 +390,7 @@ void file_test(const char* file, byte* check) ret = wc_Sha256Final(&sha256, shasum); if (ret != 0) { printf("Can't wc_Sha256Final %d\n", ret); + fclose(f); return; } diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index e3e89a73e..f804e6d9f 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -4447,6 +4447,7 @@ int rsa_test(void) free(derCert); free(pem); free(tmp); + fclose(pemFile); wc_FreeRsaKey(&caKey); return -415; } diff --git a/wolfssl/test.h b/wolfssl/test.h index f0196a323..f6b25819f 100644 --- a/wolfssl/test.h +++ b/wolfssl/test.h @@ -918,7 +918,7 @@ static INLINE unsigned int my_psk_server_cb(WOLFSSL* ssl, const char* identity, sz = ftell(file); rewind(file); fread(buff, sizeof(buff), 1, file); - + if (type == WOLFSSL_CA) { if (wolfSSL_CTX_load_verify_buffer(ctx, buff, sz, SSL_FILETYPE_PEM) != SSL_SUCCESS) @@ -934,6 +934,7 @@ static INLINE unsigned int my_psk_server_cb(WOLFSSL* ssl, const char* identity, SSL_FILETYPE_PEM) != SSL_SUCCESS) err_sys("can't load buffer key file"); } + fclose(file); } #endif /* NO_FILESYSTEM */