From 32c0e1c99a46f91bbec9b203894afdb99e2f5344 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 27 Dec 2010 22:47:37 +0100 Subject: test: Added openssh checks to the compression tests. --- tests/client/torture_algorithms.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/tests/client/torture_algorithms.c b/tests/client/torture_algorithms.c index 6cd7594..170c989 100644 --- a/tests/client/torture_algorithms.c +++ b/tests/client/torture_algorithms.c @@ -109,11 +109,14 @@ START_TEST (torture_algorithms_zlib) rc=ssh_options_set(session,SSH_OPTIONS_COMPRESSION_S_C,"zlib"); ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); rc=ssh_connect(session); - ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); - rc=ssh_userauth_none(session,NULL); - if(rc != SSH_OK){ - rc=ssh_get_error_code(session); - ck_assert_msg(rc==SSH_REQUEST_DENIED,ssh_get_error(session)); + /* Don't run the test against openssh */ + if (!ssh_get_openssh_version(session)) { + ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); + rc=ssh_userauth_none(session,NULL); + if(rc != SSH_OK){ + rc=ssh_get_error_code(session); + ck_assert_msg(rc==SSH_REQUEST_DENIED,ssh_get_error(session)); + } } ssh_disconnect(session); } @@ -128,11 +131,14 @@ START_TEST (torture_algorithms_zlib_openssh) rc=ssh_options_set(session,SSH_OPTIONS_COMPRESSION_S_C,"zlib@openssh.com"); ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); rc=ssh_connect(session); - ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); - rc=ssh_userauth_none(session,NULL); - if(rc != SSH_OK){ - rc=ssh_get_error_code(session); - ck_assert_msg(rc==SSH_REQUEST_DENIED,ssh_get_error(session)); + /* Only run the test against openssh */ + if (ssh_get_openssh_version(session)) { + ck_assert_msg(rc==SSH_OK,ssh_get_error(session)); + rc=ssh_userauth_none(session,NULL); + if(rc != SSH_OK){ + rc=ssh_get_error_code(session); + ck_assert_msg(rc==SSH_REQUEST_DENIED,ssh_get_error(session)); + } } ssh_disconnect(session); } -- cgit v1.2.3