lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-03 22:13:11 +03:00
Code Activity

Sharing state vairables between the userauth functions was a nice idea,

Browse Source 
but libssh2_userauth_list() can't share with the others.  So to be safe
don't have any share.
This commit is contained in:
James Housley
2007-06-10 13:59:05 +00:00
parent b12a16f89c
commit a5109ee5ba
3 changed files with 451 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/libssh2_priv.h
View File

@@ -657,33 +657,59 @@ struct _LIBSSH2_SESSION {
libssh2_nonblocking_states readPack_state; libssh2_nonblocking_states readPack_state;
int readPack_encrypted; int readPack_encrypted;
/* /* State variables used in libssh2_userauth_list() */
* State variables used in libssh2_userauth_list(), libssh2_nonblocking_states userauth_list_state;
* libssh2_userauth_password_ex(), libssh2_userauth_hostbased_fromfile_ex(), unsigned char *userauth_list_data;
* libssh2_userauth_publickey_fromfile_ex(), unsigned long userauth_list_data_len;
* libssh2_userauth_keyboard_interactive_ex packet_requirev_state_t userauth_list_packet_requirev_state;
*/
libssh2_nonblocking_states userauth_state; /* State variables used in libssh2_userauth_password_ex() */
unsigned char *userauth_data; libssh2_nonblocking_states userauth_pswd_state;
unsigned char userauth_data0; unsigned char *userauth_pswd_data;
unsigned long userauth_data_len; unsigned char userauth_pswd_data0;
char *userauth_newpw; unsigned long userauth_pswd_data_len;
int userauth_newpw_len; char *userauth_pswd_newpw;
unsigned char *userauth_packet; int userauth_pswd_newpw_len;
unsigned long userauth_packet_len; packet_requirev_state_t userauth_pswd_packet_requirev_state;
unsigned char *userauth_method;
unsigned long userauth_method_len; /* State variables used in libssh2_userauth_hostbased_fromfile_ex() */
unsigned char *userauth_s; libssh2_nonblocking_states userauth_host_state;
unsigned char *userauth_b; unsigned char *userauth_host_data;
unsigned int userauth_auth_name_len; unsigned long userauth_host_data_len;
char *userauth_auth_name; unsigned char *userauth_host_packet;
unsigned userauth_auth_instruction_len; unsigned long userauth_host_packet_len;
char *userauth_auth_instruction; unsigned char *userauth_host_method;
unsigned int userauth_num_prompts; unsigned long userauth_host_method_len;
int userauth_auth_failure; unsigned char *userauth_host_s;
LIBSSH2_USERAUTH_KBDINT_PROMPT *userauth_prompts; packet_requirev_state_t userauth_host_packet_requirev_state;
LIBSSH2_USERAUTH_KBDINT_RESPONSE *userauth_responses;
packet_requirev_state_t userauth_packet_requirev_state; /* State variables used in libssh2_userauth_publickey_fromfile_ex() */
libssh2_nonblocking_states userauth_pblc_state;
unsigned char *userauth_pblc_data;
unsigned long userauth_pblc_data_len;
unsigned char *userauth_pblc_packet;
unsigned long userauth_pblc_packet_len;
unsigned char *userauth_pblc_method;
unsigned long userauth_pblc_method_len;
unsigned char *userauth_pblc_s;
unsigned char *userauth_pblc_b;
packet_requirev_state_t userauth_pblc_packet_requirev_state;
/* State variables used in llibssh2_userauth_keyboard_interactive_ex() */
libssh2_nonblocking_states userauth_kybd_state;
unsigned char *userauth_kybd_data;
unsigned long userauth_kybd_data_len;
unsigned char *userauth_kybd_packet;
unsigned long userauth_kybd_packet_len;
unsigned int userauth_kybd_auth_name_len;
char *userauth_kybd_auth_name;
unsigned userauth_kybd_auth_instruction_len;
char *userauth_kybd_auth_instruction;
unsigned int userauth_kybd_num_prompts;
int userauth_kybd_auth_failure;
LIBSSH2_USERAUTH_KBDINT_PROMPT *userauth_kybd_prompts;
LIBSSH2_USERAUTH_KBDINT_RESPONSE *userauth_kybd_responses;
packet_requirev_state_t userauth_kybd_packet_requirev_state;
/* State variables used in libssh2_channel_open_ex() */ /* State variables used in libssh2_channel_open_ex() */
libssh2_nonblocking_states open_state; libssh2_nonblocking_states open_state;

41
src/session.c
View File

@@ -713,20 +713,41 @@ LIBSSH2_API void libssh2_session_free(LIBSSH2_SESSION *session)
if (session->disconnect_data) { if (session->disconnect_data) {
LIBSSH2_FREE(session, session->disconnect_data); LIBSSH2_FREE(session, session->disconnect_data);
} }
if (session->userauth_data) { if (session->userauth_list_data) {
LIBSSH2_FREE(session, session->userauth_data); LIBSSH2_FREE(session, session->userauth_list_data);
} }
if (session->userauth_newpw) { if (session->userauth_pswd_data) {
LIBSSH2_FREE(session, session->userauth_newpw); LIBSSH2_FREE(session, session->userauth_pswd_data);
} }
if (session->userauth_packet) { if (session->userauth_pswd_newpw) {
LIBSSH2_FREE(session, session->userauth_packet); LIBSSH2_FREE(session, session->userauth_pswd_newpw);
} }
if (session->userauth_method) { if (session->userauth_host_packet) {
LIBSSH2_FREE(session, session->userauth_method); LIBSSH2_FREE(session, session->userauth_host_packet);
} }
if (session->userauth_auth_instruction) { if (session->userauth_host_method) {
LIBSSH2_FREE(session, session->userauth_auth_instruction); LIBSSH2_FREE(session, session->userauth_host_method);
}
if (session->userauth_host_data) {
LIBSSH2_FREE(session, session->userauth_host_data);
}
if (session->userauth_pblc_data) {
LIBSSH2_FREE(session, session->userauth_pblc_data);
}
if (session->userauth_pblc_packet) {
LIBSSH2_FREE(session, session->userauth_pblc_packet);
}
if (session->userauth_pblc_method) {
LIBSSH2_FREE(session, session->userauth_pblc_method);
}
if (session->userauth_kybd_data) {
LIBSSH2_FREE(session, session->userauth_kybd_data);
}
if (session->userauth_kybd_packet) {
LIBSSH2_FREE(session, session->userauth_kybd_packet);
}
if (session->userauth_kybd_auth_instruction) {
LIBSSH2_FREE(session, session->userauth_kybd_auth_instruction);
} }
if (session->open_packet) { if (session->open_packet) {
LIBSSH2_FREE(session, session->open_packet); LIBSSH2_FREE(session, session->open_packet);

731
src/userauth.c
View File

File diff suppressed because it is too large Load Diff