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

tests: Use new auth API in the torture_auth test.

Browse Source
This commit is contained in:
Andreas Schneider
2013-12-15 20:26:17 +01:00
parent 8b407f1ca2
commit f8debe9a19
1 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/client/torture_auth.c
View File

@@ -64,9 +64,10 @@ static void torture_auth_autopubkey(void **state) {
if (rc == SSH_ERROR) { if (rc == SSH_ERROR) {
assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED); assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED);
} }
assert_true(ssh_auth_list(session) & SSH_AUTH_METHOD_PUBLICKEY); rc = ssh_userauth_list(session, NULL);
assert_true(rc & SSH_AUTH_METHOD_PUBLICKEY);
rc = ssh_userauth_autopubkey(session, NULL); rc = ssh_userauth_publickey_auto(session, NULL, NULL);
assert_true(rc == SSH_AUTH_SUCCESS); assert_true(rc == SSH_AUTH_SUCCESS);
} }
@@ -92,11 +93,11 @@ static void torture_auth_autopubkey_nonblocking(void **state) {
if (rc == SSH_ERROR) { if (rc == SSH_ERROR) {
assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED); assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED);
} }
assert_true(ssh_auth_list(session) & SSH_AUTH_METHOD_PUBLICKEY); rc = ssh_userauth_list(session, NULL);
ssh_set_blocking(session, 0); ssh_set_blocking(session, 0);
do { do {
rc = ssh_userauth_autopubkey(session, NULL); rc = ssh_userauth_publickey_auto(session, NULL, NULL);
} while (rc == SSH_AUTH_AGAIN); } while (rc == SSH_AUTH_AGAIN);
assert_true(rc == SSH_AUTH_SUCCESS); assert_true(rc == SSH_AUTH_SUCCESS);
} }
@@ -130,7 +131,8 @@ static void torture_auth_kbdint(void **state) {
if (rc == SSH_ERROR) { if (rc == SSH_ERROR) {
assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED); assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED);
} }
assert_true(ssh_auth_list(session) & SSH_AUTH_METHOD_INTERACTIVE); rc = ssh_userauth_list(session, NULL);
assert_true(rc & SSH_AUTH_METHOD_INTERACTIVE);
rc = ssh_userauth_kbdint(session, NULL, NULL); rc = ssh_userauth_kbdint(session, NULL, NULL);
assert_true(rc == SSH_AUTH_INFO); assert_true(rc == SSH_AUTH_INFO);
@@ -177,7 +179,9 @@ static void torture_auth_kbdint_nonblocking(void **state) {
if (rc == SSH_ERROR) { if (rc == SSH_ERROR) {
assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED); assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED);
} }
assert_true(ssh_auth_list(session) & SSH_AUTH_METHOD_INTERACTIVE); rc = ssh_userauth_list(session, NULL);
assert_true(rc & SSH_AUTH_METHOD_INTERACTIVE);
ssh_set_blocking(session,0); ssh_set_blocking(session,0);
do { do {
rc = ssh_userauth_kbdint(session, NULL, NULL); rc = ssh_userauth_kbdint(session, NULL, NULL);
@@ -231,7 +235,8 @@ static void torture_auth_password(void **state) {
if (rc == SSH_AUTH_ERROR) { if (rc == SSH_AUTH_ERROR) {
assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED); assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED);
} }
assert_true(ssh_auth_list(session) & SSH_AUTH_METHOD_PASSWORD); rc = ssh_userauth_list(session, NULL);
assert_true(rc & SSH_AUTH_METHOD_PASSWORD);
rc = ssh_userauth_password(session, NULL, password); rc = ssh_userauth_password(session, NULL, password);
assert_true(rc == SSH_AUTH_SUCCESS); assert_true(rc == SSH_AUTH_SUCCESS);
@@ -270,7 +275,8 @@ static void torture_auth_password_nonblocking(void **state) {
if (rc == SSH_AUTH_ERROR) { if (rc == SSH_AUTH_ERROR) {
assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED); assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED);
} }
assert_true(ssh_auth_list(session) & SSH_AUTH_METHOD_PASSWORD); rc = ssh_userauth_list(session, NULL);
assert_true(rc & SSH_AUTH_METHOD_PASSWORD);
do { do {
rc = ssh_userauth_password(session, NULL, password); rc = ssh_userauth_password(session, NULL, password);
@@ -304,7 +310,8 @@ static void torture_auth_agent(void **state) {
if (rc == SSH_ERROR) { if (rc == SSH_ERROR) {
assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED); assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED);
} }
assert_true(ssh_auth_list(session) & SSH_AUTH_METHOD_PUBLICKEY); rc = ssh_userauth_list(session, NULL);
assert_true(rc & SSH_AUTH_METHOD_PUBLICKEY);
rc = ssh_userauth_agent(session, NULL); rc = ssh_userauth_agent(session, NULL);
assert_true(rc == SSH_AUTH_SUCCESS); assert_true(rc == SSH_AUTH_SUCCESS);
@@ -335,7 +342,9 @@ static void torture_auth_agent_nonblocking(void **state) {
if (rc == SSH_ERROR) { if (rc == SSH_ERROR) {
assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED); assert_true(ssh_get_error_code(session) == SSH_REQUEST_DENIED);
} }
assert_true(ssh_auth_list(session) & SSH_AUTH_METHOD_PUBLICKEY); rc = ssh_userauth_list(session, NULL);
assert_true(rc & SSH_AUTH_METHOD_PUBLICKEY);
ssh_set_blocking(session, 0); ssh_set_blocking(session, 0);
do { do {
rc = ssh_userauth_agent(session, NULL); rc = ssh_userauth_agent(session, NULL);