Don't use ciphersuites for inflating the ClientHello in clienthellotest

[openssl.git] / test / ssl_test.c

diff --git a/test/ssl_test.c b/test/ssl_test.c
index c8e71bb8b17b8705dc06b7408519f91caca8edec..44232dbdf47ce79041ccb4cd2d9f6b9d3fd462d9 100644 (file)
--- a/test/ssl_test.c
+++ b/test/ssl_test.c
@@ -413,7 +413,8 @@ static int test_handshake(int idx)
     result = do_handshake(server_ctx, server2_ctx, client_ctx,
                           resume_server_ctx, resume_client_ctx, test_ctx);
 
-    ret = check_test(result, test_ctx);
+    if (result != NULL)
+        ret = check_test(result, test_ctx);
 
 err:
     CONF_modules_unload(0);
@@ -427,23 +428,22 @@ err:
     return ret;
 }
 
-int test_main(int argc, char **argv)
+int setup_tests(void)
 {
-    int result = EXIT_FAILURE;
     long num_tests;
 
-    if (!TEST_int_eq(argc, 2)
-            || !TEST_ptr(conf = NCONF_new(NULL))
+    if (!TEST_ptr(conf = NCONF_new(NULL))
             /* argv[1] should point to the test conf file */
-            || !TEST_int_gt(NCONF_load(conf, argv[1], NULL), 0)
+            || !TEST_int_gt(NCONF_load(conf, test_get_argument(0), NULL), 0)
             || !TEST_int_ne(NCONF_get_number_e(conf, NULL, "num_tests",
                                                &num_tests), 0))
-        goto err;
+        return 0;
 
-    ADD_ALL_TESTS(test_handshake, (int)(num_tests));
-    result = run_tests(argv[0]);
+    ADD_ALL_TESTS(test_handshake, (int)num_tests);
+    return 1;
+}
 
-err:
+void cleanup_tests(void)
+{
     NCONF_free(conf);
-    return result;
 }