torture: Fix torture_ssh_session() for cwrap testing

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>

tests/torture.c

@@ -462,11 +462,6 @@ ssh_session torture_ssh_session(const char *host,
         return NULL;
     }
 
-    rc = ssh_options_set(session, SSH_OPTIONS_SSH_DIR, "/tmp");
-    if (rc < 0) {
-        goto failed;
-    }
-
     if (ssh_options_set(session, SSH_OPTIONS_HOST, host) < 0) {
         goto failed;
     }
@@ -504,10 +499,10 @@ ssh_session torture_ssh_session(const char *host,
     }
 
     if (password != NULL) {
-        if (method & SSH_AUTH_METHOD_INTERACTIVE) {
+        if (method & SSH_AUTH_METHOD_PASSWORD) {
-            rc = _torture_auth_kbdint(session, password);
-        } else if (method & SSH_AUTH_METHOD_PASSWORD) {
             rc = ssh_userauth_password(session, NULL, password);
+        } else if (method & SSH_AUTH_METHOD_INTERACTIVE) {
+            rc = _torture_auth_kbdint(session, password);
         }
     } else {
         rc = ssh_userauth_publickey_auto(session, NULL, NULL);