diff options
-rw-r--r-- | tests/client/torture_auth.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/tests/client/torture_auth.c b/tests/client/torture_auth.c index 3952b466..421047fc 100644 --- a/tests/client/torture_auth.c +++ b/tests/client/torture_auth.c @@ -88,14 +88,19 @@ static void torture_auth_autopubkey_nonblocking(void **state) { rc = ssh_connect(session); assert_true(rc == SSH_OK); - rc = ssh_userauth_none(session,NULL); + ssh_set_blocking(session,0); + do { + rc = ssh_userauth_none(session, NULL); + } while (rc == SSH_AUTH_AGAIN); + /* This request should return a SSH_REQUEST_DENIED error */ if (rc == SSH_ERROR) { assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED); } + rc = ssh_userauth_list(session, NULL); + assert_true(rc & SSH_AUTH_METHOD_PUBLICKEY); - ssh_set_blocking(session, 0); do { rc = ssh_userauth_publickey_auto(session, NULL, NULL); } while (rc == SSH_AUTH_AGAIN); @@ -174,7 +179,11 @@ static void torture_auth_kbdint_nonblocking(void **state) { rc = ssh_connect(session); assert_true(rc == SSH_OK); - rc = ssh_userauth_none(session,NULL); + ssh_set_blocking(session,0); + do { + rc = ssh_userauth_none(session, NULL); + } while (rc == SSH_AUTH_AGAIN); + /* This request should return a SSH_REQUEST_DENIED error */ if (rc == SSH_ERROR) { assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED); @@ -182,7 +191,6 @@ static void torture_auth_kbdint_nonblocking(void **state) { rc = ssh_userauth_list(session, NULL); assert_true(rc & SSH_AUTH_METHOD_INTERACTIVE); - ssh_set_blocking(session,0); do { rc = ssh_userauth_kbdint(session, NULL, NULL); } while (rc == SSH_AUTH_AGAIN); @@ -266,18 +274,19 @@ static void torture_auth_password_nonblocking(void **state) { rc = ssh_connect(session); assert_true(rc == SSH_OK); + ssh_set_blocking(session,0); do { rc = ssh_userauth_none(session, NULL); - } while (rc==SSH_AUTH_AGAIN); + } while (rc == SSH_AUTH_AGAIN); /* This request should return a SSH_REQUEST_DENIED error */ if (rc == SSH_AUTH_ERROR) { assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED); } + rc = ssh_userauth_list(session, NULL); assert_true(rc & SSH_AUTH_METHOD_PASSWORD); - ssh_set_blocking(session,0); do { rc = ssh_userauth_password(session, NULL, password); } while(rc==SSH_AUTH_AGAIN); @@ -345,7 +354,6 @@ static void torture_auth_agent_nonblocking(void **state) { rc = ssh_userauth_list(session, NULL); assert_true(rc & SSH_AUTH_METHOD_PUBLICKEY); - ssh_set_blocking(session, 0); do { rc = ssh_userauth_agent(session, NULL); } while (rc == SSH_AUTH_AGAIN); |