ssh_auth_password made nonblocking

1 files changed, 45 insertions, 1 deletions

diff --git a/tests/client/torture_auth.c b/tests/client/torture_auth.c
index adcf708..3637a6a 100644
--- a/tests/client/torture_auth.c
+++ b/tests/client/torture_auth.c
@@ -142,7 +142,7 @@ static void torture_auth_password(void **state) {
 
     rc = ssh_userauth_none(session, NULL);
     /* This request should return a SSH_REQUEST_DENIED error */
-    if (rc == SSH_ERROR) {
+    if (rc == SSH_AUTH_ERROR) {
         assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED);
     }
     assert_true(ssh_auth_list(session) & SSH_AUTH_METHOD_PASSWORD);
@@ -151,11 +151,55 @@ static void torture_auth_password(void **state) {
     assert_true(rc == SSH_AUTH_SUCCESS);
 }
 
+static void torture_auth_password_nonblocking(void **state) {
+    ssh_session session = *state;
+    char *user = getenv("TORTURE_USER");
+    char *password = getenv("TORTURE_PASSWORD");
+    int rc;
+
+    if (user == NULL) {
+        print_message("*** Please set the environment variable TORTURE_USER"
+                      " to enable this test!!\n");
+        return;
+    }
+
+    if (password == NULL) {
+        print_message("*** Please set the environment variable "
+                      "TORTURE_PASSWORD to enable this test!!\n");
+        return;
+    }
+
+    rc = ssh_options_set(session, SSH_OPTIONS_USER, user);
+    assert_true(rc == SSH_OK);
+
+    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);
+
+    /* This request should return a SSH_REQUEST_DENIED error */
+    if (rc == SSH_AUTH_ERROR) {
+        assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED);
+    }
+    assert_true(ssh_auth_list(session) & SSH_AUTH_METHOD_PASSWORD);
+
+    do {
+      rc = ssh_userauth_password(session, NULL, password);
+    } while(rc==SSH_AUTH_AGAIN);
+
+    assert_true(rc == SSH_AUTH_SUCCESS);
+}
+
+
 int torture_run_tests(void) {
     int rc;
     const UnitTest tests[] = {
         unit_test_setup_teardown(torture_auth_kbdint, setup, teardown),
         unit_test_setup_teardown(torture_auth_password, setup, teardown),
+        unit_test_setup_teardown(torture_auth_password_nonblocking, setup, teardown),
         unit_test_setup_teardown(torture_auth_autopubkey, setup, teardown),
     };