WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #745 from JacobBarthelmeh/Windows 

wolfCrypt cleanup in test.c moved and add wolfSSL init to testsuite w…
pull/746/head
toddouska 2017-02-09 10:19:51 -08:00 committed by GitHub
parent 3a6e8bf0d0 6a6e61f1d8
commit 8763a71420
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/api.c
View File

@ -2650,7 +2650,7 @@ static void test_wolfSSL_ERR_peek_last_error_line(void)
{ {
#if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \ #if defined(OPENSSL_EXTRA) && !defined(NO_CERTS) && \
!defined(NO_FILESYSTEM) && defined(DEBUG_WOLFSSL) && \ !defined(NO_FILESYSTEM) && defined(DEBUG_WOLFSSL) && \
!defined(NO_OLD_TLS) !defined(NO_OLD_TLS) && defined(HAVE_IO_TESTS_DEPENDENCIES)
tcp_ready ready; tcp_ready ready;
func_args client_args; func_args client_args;
func_args server_args; func_args server_args;

2
testsuite/testsuite.c
View File

@ -405,11 +405,13 @@ int main(int argc, char** argv)
server_args.argc = argc; server_args.argc = argc;
server_args.argv = argv; server_args.argv = argv;
wolfSSL_Init();
ChangeToWolfRoot(); ChangeToWolfRoot();
wolfcrypt_test(&server_args); wolfcrypt_test(&server_args);
if (server_args.return_code != 0) return server_args.return_code; if (server_args.return_code != 0) return server_args.return_code;
wolfSSL_Cleanup();
printf("\nAll tests passed!\n"); printf("\nAll tests passed!\n");
EXIT_TEST(EXIT_SUCCESS); EXIT_TEST(EXIT_SUCCESS);

12
wolfcrypt/test/test.c
View File

@ -327,8 +327,6 @@ int wolfcrypt_test(void* args)
wolfSSL_Debugging_ON(); wolfSSL_Debugging_ON();
#endif #endif
wolfCrypt_Init();
#if defined(OPENSSL_EXTRA) || defined(DEBUG_WOLFSSL_VERBOSE) #if defined(OPENSSL_EXTRA) || defined(DEBUG_WOLFSSL_VERBOSE)
wc_SetLoggingHeap(HEAP_HINT); wc_SetLoggingHeap(HEAP_HINT);
#endif #endif
@ -730,10 +728,6 @@ int wolfcrypt_test(void* args)
printf( "PKCS7encrypted test passed!\n"); printf( "PKCS7encrypted test passed!\n");
#endif #endif
if ((ret = wolfCrypt_Cleanup())!= 0) {
return err_sys("Error with wolfCrypt_Cleanup!\n", ret);
}
#if defined(USE_WOLFSSL_MEMORY) && defined(WOLFSSL_TRACK_MEMORY) #if defined(USE_WOLFSSL_MEMORY) && defined(WOLFSSL_TRACK_MEMORY)
ShowMemoryTracker(); ShowMemoryTracker();
#endif #endif
@ -762,8 +756,14 @@ int wolfcrypt_test(void* args)
args.argc = argc; args.argc = argc;
args.argv = argv; args.argv = argv;
wolfCrypt_Init();
wolfcrypt_test(&args); wolfcrypt_test(&args);
if (wolfCrypt_Cleanup() != 0) {
return err_sys("Error with wolfCrypt_Cleanup!\n", -1239);
}
#ifdef HAVE_WNR #ifdef HAVE_WNR
if (wc_FreeNetRandom() < 0) if (wc_FreeNetRandom() < 0)
err_sys("Failed to free netRandom context", -1238); err_sys("Failed to free netRandom context", -1238);