diff options
| author | Jakub Jelen <jjelen@redhat.com> | 2017-11-21 16:09:01 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2017-12-15 11:59:19 +0100 |
| commit | b92c499626f8714d8c13d745c8902aefe963b44e (patch) | |
| tree | 7e92f8d13c1b564b769a7991abe3777c34018cda | |
| parent | 9fce33a2e3322762d4bc2d0d764df142e0f8c860 (diff) | |
| download | libssh-b92c499626f8714d8c13d745c8902aefe963b44e.tar.gz libssh-b92c499626f8714d8c13d745c8902aefe963b44e.tar.xz libssh-b92c499626f8714d8c13d745c8902aefe963b44e.zip | |
tests: Do not test blowfish ciphers with OpenSSH 7.6 and newer
| -rw-r--r-- | tests/client/torture_algorithms.c | 4 | ||||
| -rw-r--r-- | tests/torture.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/client/torture_algorithms.c b/tests/client/torture_algorithms.c index 6f49eff3..d928cfc0 100644 --- a/tests/client/torture_algorithms.c +++ b/tests/client/torture_algorithms.c @@ -242,6 +242,7 @@ static void torture_algorithms_3des_cbc_hmac_sha2_512(void **state) { test_algorithm(s->ssh.session, NULL/*kex*/, "3des-cbc", "hmac-sha2-512"); } +#if ((OPENSSH_VERSION_MAJOR == 7 && OPENSSH_VERSION_MINOR < 6) || OPENSSH_VERSION_MAJOR <= 6) static void torture_algorithms_blowfish_cbc_hmac_sha1(void **state) { struct torture_state *s = *state; @@ -259,6 +260,7 @@ static void torture_algorithms_blowfish_cbc_hmac_sha2_512(void **state) { test_algorithm(s->ssh.session, NULL/*kex*/, "blowfish-cbc", "hmac-sha2-512"); } +#endif static void torture_algorithms_zlib(void **state) { struct torture_state *s = *state; @@ -429,6 +431,7 @@ int torture_run_tests(void) { cmocka_unit_test_setup_teardown(torture_algorithms_3des_cbc_hmac_sha2_512, session_setup, session_teardown), +#if ((OPENSSH_VERSION_MAJOR == 7 && OPENSSH_VERSION_MINOR < 6) || OPENSSH_VERSION_MAJOR <= 6) cmocka_unit_test_setup_teardown(torture_algorithms_blowfish_cbc_hmac_sha1, session_setup, session_teardown), @@ -438,6 +441,7 @@ int torture_run_tests(void) { cmocka_unit_test_setup_teardown(torture_algorithms_blowfish_cbc_hmac_sha2_512, session_setup, session_teardown), +#endif cmocka_unit_test_setup_teardown(torture_algorithms_zlib, session_setup, session_teardown), diff --git a/tests/torture.c b/tests/torture.c index 545fc2e3..e8868b05 100644 --- a/tests/torture.c +++ b/tests/torture.c @@ -899,7 +899,11 @@ static void torture_setup_create_sshd_config(void **state) "\n" #if (OPENSSH_VERSION_MAJOR == 6 && OPENSSH_VERSION_MINOR >= 7) || (OPENSSH_VERSION_MAJOR >= 7) "HostKeyAlgorithms +ssh-dss\n" +# if (OPENSSH_VERSION_MAJOR == 7 && OPENSSH_VERSION_MINOR < 6) "Ciphers +3des-cbc,aes128-cbc,aes192-cbc,aes256-cbc,blowfish-cbc\n" +# else + "Ciphers +3des-cbc,aes128-cbc,aes192-cbc,aes256-cbc\n" +# endif "KexAlgorithms +diffie-hellman-group1-sha1" #else "Ciphers 3des-cbc,aes128-cbc,aes192-cbc,aes256-cbc,aes128-ctr," |