wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix the two new tests since approval.

Browse source 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3953)
This commit is contained in:
Pauli 2017-07-27 08:08:36 +10:00
parent ad887416f1
commit 43405889f4
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
test/asn1_string_table_test.c
View file

@ -70,7 +70,8 @@ static int test_string_tbl()
return rv; return rv;
} }
void register_tests(void) int setup_tests(void)
{ {
ADD_TEST(test_string_tbl); ADD_TEST(test_string_tbl);
return 1;
} }

30
test/sslbuffertest.c
View file

@ -150,31 +150,33 @@ static int test_func(int test)
return result; return result;
} }
int test_main(int argc, char *argv[]) int global_init(void)
{ {
int testresult = EXIT_FAILURE;
CRYPTO_set_mem_debug(1); CRYPTO_set_mem_debug(1);
CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON); CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
return 1;
if (argc != 3) {
TEST_error("Invalid argument count\n");
goto end;
} }
int setup_tests(void)
{
char *cert, *pkey;
if (!TEST_ptr(cert = test_get_argument(0))
|| !TEST_ptr(pkey = test_get_argument(1)))
return 0;
if (!create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(), if (!create_ssl_ctx_pair(TLS_server_method(), TLS_client_method(),
&serverctx, &clientctx, argv[1], argv[2])) { &serverctx, &clientctx, cert, pkey)) {
TEST_error("Failed to create SSL_CTX pair\n"); TEST_error("Failed to create SSL_CTX pair\n");
goto end; return 0;
} }
ADD_ALL_TESTS(test_func, 9); ADD_ALL_TESTS(test_func, 9);
return 1;
}
testresult = run_tests(argv[0]); void cleanup_tests(void)
{
end:
SSL_CTX_free(clientctx); SSL_CTX_free(clientctx);
SSL_CTX_free(serverctx); SSL_CTX_free(serverctx);
return testresult;
} }