lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-29 01:03:57 +03:00
Code Activity

auth1: Fix non-blocking SSHv1 auth

Browse Source 
BUG: https://red.libssh.org/issues/232

Thanks to Fengyu Gao.

TODO: Add SSHv1 tests to our testsuite.

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2016-05-02 12:18:06 +02:00
parent 3c69092cde
commit 33ecaaac01
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/auth1.c
View File

@@ -23,6 +23,7 @@
#include "config.h" #include "config.h"
#include <errno.h>
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
@@ -117,6 +118,7 @@ static int send_username(ssh_session session, const char *username) {
if (ssh_packet_send(session) == SSH_ERROR) { if (ssh_packet_send(session) == SSH_ERROR) {
return SSH_AUTH_ERROR; return SSH_AUTH_ERROR;
} }
return SSH_AUTH_AGAIN;
pending: pending:
rc = wait_auth1_status(session); rc = wait_auth1_status(session);
switch (rc){ switch (rc){
@@ -161,12 +163,14 @@ int ssh_userauth1_password(ssh_session session, const char *username,
ssh_string pwd = NULL; ssh_string pwd = NULL;
int rc; int rc;
if (session->pending_call_state == SSH_PENDING_CALL_AUTH_PASSWORD) {
goto pending;
}
rc = send_username(session, username); rc = send_username(session, username);
if (rc != SSH_AUTH_DENIED) { if (rc != SSH_AUTH_DENIED) {
return rc; return rc;
} }
if (session->pending_call_state == SSH_PENDING_CALL_AUTH_PASSWORD)
goto pending;
/* we trick a bit here. A known flaw in SSH1 protocol is that it's /* we trick a bit here. A known flaw in SSH1 protocol is that it's
* easy to guess password sizes. * easy to guess password sizes.
* not that sure ... * not that sure ...
@@ -219,8 +223,11 @@ int ssh_userauth1_password(ssh_session session, const char *username,
} }
pending: pending:
rc = wait_auth1_status(session); rc = wait_auth1_status(session);
if (rc != SSH_AUTH_AGAIN) if (rc == SSH_AUTH_ERROR && errno == EAGAIN) {
/* Nothing to do */
} else if (rc != SSH_AUTH_AGAIN) {
session->pending_call_state = SSH_PENDING_CALL_NONE; session->pending_call_state = SSH_PENDING_CALL_NONE;
}
return rc; return rc;
} }