lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-05 20:55:46 +03:00
Code Activity

torture: Use new userauth functions.

Browse Source
This commit is contained in:
Andreas Schneider
2012-10-07 23:21:17 +02:00
parent 5f0f334d1c
commit e17fcd70f9
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/torture.c
View File

@@ -156,6 +156,7 @@ ssh_session torture_ssh_session(const char *host,
const char *user, const char *user,
const char *password) { const char *password) {
ssh_session session; ssh_session session;
int method;
int rc; int rc;
if (host == NULL) { if (host == NULL) {
@@ -192,14 +193,20 @@ ssh_session torture_ssh_session(const char *host,
if (rc == SSH_ERROR) { if (rc == SSH_ERROR) {
goto failed; goto failed;
} }
if (!(ssh_auth_list(session) & SSH_AUTH_METHOD_INTERACTIVE)) { method = ssh_userauth_list(session, NULL);
if (method == 0) {
goto failed; goto failed;
} }
if (password != NULL) { if (password != NULL) {
if (method & SSH_AUTH_METHOD_INTERACTIVE) {
rc = _torture_auth_kbdint(session, password); rc = _torture_auth_kbdint(session, password);
}
if (method & SSH_AUTH_METHOD_PASSWORD) {
rc = ssh_userauth_password(session, NULL, password);
}
} else { } else {
rc = ssh_userauth_autopubkey(session, NULL); rc = ssh_userauth_publickey_auto(session, NULL, NULL);
if (rc == SSH_AUTH_ERROR) { if (rc == SSH_AUTH_ERROR) {
goto failed; goto failed;
} }