Commit 43405889 authored by Pauli's avatar Pauli
Browse files

Fix the two new tests since approval. 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3953)
parent ad887416

test/asn1_string_table_test.c

+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ static int test_string_tbl() 
    return rv;

}



void register_tests(void)

int setup_tests(void)

{

    ADD_TEST(test_string_tbl);

    return 1;

}

test/sslbuffertest.c

+16 −14
Original line number Diff line number Diff line
@@ -150,31 +150,33 @@ static int test_func(int test) 
    return result;

}



int test_main(int argc, char *argv[])

int global_init(void)

{

    int testresult = EXIT_FAILURE;



    CRYPTO_set_mem_debug(1);

    CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);



    if (argc != 3) {

        TEST_error("Invalid argument count\n");

        goto end;

    return 1;

}



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(),

                             &serverctx, &clientctx, argv[1], argv[2])) {

                             &serverctx, &clientctx, cert, pkey)) {

        TEST_error("Failed to create SSL_CTX pair\n");

        goto end;

        return 0;

    }



    ADD_ALL_TESTS(test_func, 9);

    return 1;

}



    testresult = run_tests(argv[0]);



 end:

void cleanup_tests(void)

{

    SSL_CTX_free(clientctx);

    SSL_CTX_free(serverctx);



    return testresult;

}