From 74102dfd7ab5f3bd4f67b1309fd825f4669bbcba Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Tue, 2 Oct 2018 15:21:58 +0200 Subject: Assorted changes from master to make torture_algorithms test working Cherry-picked from the following commits: cbd75c3e350e2e0e5589d4865f31101588da0473 3014e3c458dee09ebf1deae560c354eb1ecdd703 --- tests/client/CMakeLists.txt | 23 +++++++++++++++++++- tests/client/torture_algorithms.c | 44 ++++++++++++++++++++++++++------------- tests/torture.c | 4 ++-- tests/torture.h | 2 ++ 4 files changed, 55 insertions(+), 18 deletions(-) diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt index 616060c3..dc1c4b3b 100644 --- a/tests/client/CMakeLists.txt +++ b/tests/client/CMakeLists.txt @@ -1,6 +1,5 @@ project(clienttests C) -add_cmocka_test(torture_algorithms torture_algorithms.c ${TORTURE_LIBRARY}) add_cmocka_test(torture_auth torture_auth.c ${TORTURE_LIBRARY}) add_cmocka_test(torture_connect torture_connect.c ${TORTURE_LIBRARY}) add_cmocka_test(torture_knownhosts torture_knownhosts.c ${TORTURE_LIBRARY}) @@ -13,3 +12,25 @@ if (WITH_SFTP) add_cmocka_test(torture_sftp_dir torture_sftp_dir.c ${TORTURE_LIBRARY}) add_cmocka_test(torture_sftp_read torture_sftp_read.c ${TORTURE_LIBRARY}) endif (WITH_SFTP) + +set(LIBSSH_CLIENT_TESTS + torture_algorithms) + +foreach(_CLI_TEST ${LIBSSH_CLIENT_TESTS}) + add_cmocka_test(${_CLI_TEST} ${_CLI_TEST}.c ${TORTURE_LIBRARY}) + + if (OSX) + set_property( + TEST + ${_CLI_TEST} + PROPERTY + ENVIRONMENT DYLD_FORCE_FLAT_NAMESPACE=1;DYLD_INSERT_LIBRARIES=${SOCKET_WRAPPER_LIBRARY}) + else () + set_property( + TEST + ${_CLI_TEST} + PROPERTY + ENVIRONMENT ${TORTURE_ENVIRONMENT}) + endif() +endforeach() + diff --git a/tests/client/torture_algorithms.c b/tests/client/torture_algorithms.c index 81e0c10a..a8905138 100644 --- a/tests/client/torture_algorithms.c +++ b/tests/client/torture_algorithms.c @@ -25,11 +25,37 @@ #include "libssh/libssh.h" #include "libssh/priv.h" +#include +#include +#include + +static int sshd_setup(void **state) +{ + torture_setup_sshd_server(state); + + return 0; +} + +static int sshd_teardown(void **state) { + torture_teardown_sshd_server(state); + + return 0; +} static void setup(void **state) { int verbosity=torture_libssh_verbosity(); ssh_session session = ssh_new(); + struct passwd *pwd; + int rc; + + pwd = getpwnam("bob"); + assert_non_null(pwd); + + rc = setuid(pwd->pw_uid); + assert_return_code(rc, errno); + ssh_options_set(session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity); + ssh_options_set(session, SSH_OPTIONS_HOST, TORTURE_SSH_SERVER); *state = session; } @@ -40,9 +66,6 @@ static void teardown(void **state) { static void test_algorithm(ssh_session session, const char *algo, const char *hmac) { int rc; - rc = ssh_options_set(session, SSH_OPTIONS_HOST, "localhost"); - assert_true(rc == SSH_OK); - rc = ssh_options_set(session, SSH_OPTIONS_CIPHERS_C_S, algo); assert_true(rc == SSH_OK); @@ -169,9 +192,6 @@ static void torture_algorithms_zlib(void **state) { ssh_session session = *state; int rc; - rc = ssh_options_set(session,SSH_OPTIONS_HOST,"localhost"); - assert_true(rc == SSH_OK); - rc = ssh_options_set(session, SSH_OPTIONS_COMPRESSION_C_S, "zlib"); #ifdef WITH_ZLIB assert_true(rc == SSH_OK); @@ -209,9 +229,6 @@ static void torture_algorithms_zlib_openssh(void **state) { ssh_session session = *state; int rc; - rc = ssh_options_set(session,SSH_OPTIONS_HOST,"localhost"); - assert_true(rc == SSH_OK); - rc = ssh_options_set(session, SSH_OPTIONS_COMPRESSION_C_S, "zlib@openssh.com"); #ifdef WITH_ZLIB assert_true(rc == SSH_OK); @@ -251,9 +268,6 @@ static void torture_algorithms_ecdh_sha2_nistp256(void **state) { ssh_session session = *state; int rc; - rc = ssh_options_set(session,SSH_OPTIONS_HOST,"localhost"); - assert_true(rc == SSH_OK); - rc = ssh_options_set(session, SSH_OPTIONS_KEY_EXCHANGE, "ecdh-sha2-nistp256"); assert_true(rc == SSH_OK); @@ -273,9 +287,6 @@ static void torture_algorithms_dh_group1(void **state) { ssh_session session = *state; int rc; - rc = ssh_options_set(session,SSH_OPTIONS_HOST,"localhost"); - assert_true(rc == SSH_OK); - rc = ssh_options_set(session, SSH_OPTIONS_KEY_EXCHANGE, "diffie-hellman-group1-sha1"); assert_true(rc == SSH_OK); @@ -291,6 +302,7 @@ static void torture_algorithms_dh_group1(void **state) { } int torture_run_tests(void) { int rc; + struct torture_state *s = NULL; UnitTest tests[] = { unit_test_setup_teardown(torture_algorithms_aes128_cbc_hmac_sha1, setup, teardown), unit_test_setup_teardown(torture_algorithms_aes128_cbc_hmac_sha2_256, setup, teardown), @@ -328,7 +340,9 @@ int torture_run_tests(void) { ssh_init(); torture_filter_tests(tests); + sshd_setup((void **)&s); rc = run_tests(tests); + sshd_teardown((void **)&s); ssh_finalize(); return rc; diff --git a/tests/torture.c b/tests/torture.c index bc43f04e..dfd55be8 100644 --- a/tests/torture.c +++ b/tests/torture.c @@ -380,7 +380,7 @@ int torture_terminate_process(const char *pidfile) /* Make sure the daemon goes away! */ kill(pid, SIGTERM); - usleep(200); + usleep(10 * 1000); rc = kill(pid, 0); if (rc != 0) { @@ -872,7 +872,7 @@ void torture_setup_sshd_server(void **state) assert_return_code(rc, errno); /* Give the process some time to start */ - usleep(1000); + usleep(100 * 1000); setenv("SOCKET_WRAPPER_DEFAULT_IFACE", "21", 1); unsetenv("PAM_WRAPPER"); diff --git a/tests/torture.h b/tests/torture.h index 643e4539..6d804afd 100644 --- a/tests/torture.h +++ b/tests/torture.h @@ -46,6 +46,8 @@ assert_true(code >= 0) #endif /* assert_return_code */ +#define TORTURE_SSH_SERVER "127.0.0.10" + #define TORTURE_TESTKEY_PASSWORD "libssh-rocks" /* Used by main to communicate with parse_opt. */ -- cgit v1.2.3