shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-07 10:40:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix conflicting declarations of ssh_session and ssh_kbdint.

Browse Source
This commit is contained in:
Andreas Schneider
2009-07-25 20:26:01 +02:00
parent 5d1fa1be24
commit 3b8c4dc750
10 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/libssh/libssh.h
View File

@@ -81,8 +81,8 @@ typedef struct ssh_agent_struct AGENT;
#endif
typedef struct ssh_options_struct SSH_OPTIONS;
typedef struct ssh_session SSH_SESSION;
typedef struct ssh_kbdint SSH_KBDINT;
typedef struct ssh_session_struct SSH_SESSION;
typedef struct ssh_kbdint_struct SSH_KBDINT;
typedef struct ssh_string_struct* ssh_string;
typedef struct ssh_buffer_struct* ssh_buffer;
@@ -91,8 +91,8 @@ typedef struct ssh_private_key_struct* ssh_private_key;
typedef struct ssh_options_struct* ssh_options;
typedef struct ssh_channel_struct* ssh_channel;
typedef struct ssh_agent_struct* ssh_agent;
typedef struct ssh_session* ssh_session;
typedef struct ssh_kbdint* ssh_kbdint;
typedef struct ssh_session_struct* ssh_session;
typedef struct ssh_kbdint_struct* ssh_kbdint;
/* Socket type */
#ifdef _WIN32

22
include/libssh/priv.h
View File

@@ -337,7 +337,7 @@ struct ssh_keys_struct {
struct ssh_message;
struct ssh_session {
struct ssh_session_struct {
struct error_struct error;
struct socket *socket;
SSH_OPTIONS *options;
@@ -391,7 +391,7 @@ struct ssh_session {
ssh_agent agent; /* ssh agent */
/* keyb interactive data */
struct ssh_kbdint *kbdint;
struct ssh_kbdint_struct *kbdint;
int version; /* 1 or 2 */
/* server host keys */
ssh_private_key rsa_key;
@@ -400,12 +400,12 @@ struct ssh_session {
int auth_methods;
int hostkeys; /* contains type of host key wanted by client, in server impl */
struct ssh_list *ssh_message_list; /* list of delayed SSH messages */
int (*ssh_message_callback)( struct ssh_session *session,struct ssh_message *msg);
int (*ssh_message_callback)( struct ssh_session_struct *session,struct ssh_message *msg);
int log_verbosity; /*cached copy of the option structure */
int log_indent; /* indentation level in enter_function logs */
};
struct ssh_kbdint {
struct ssh_kbdint_struct {
u32 nprompts;
char *name;
char *instruction;
@@ -482,7 +482,7 @@ struct ssh_message {
*
* @return An allocated ssh agent structure or NULL on error.
*/
struct ssh_agent_struct *agent_new(struct ssh_session *session);
struct ssh_agent_struct *agent_new(struct ssh_session_struct *session);
void agent_close(struct ssh_agent_struct *agent);
@@ -500,17 +500,17 @@ void agent_free(struct ssh_agent_struct *agent);
*
* @return 1 if it is running, 0 if not.
*/
int agent_is_running(struct ssh_session *session);
int agent_is_running(struct ssh_session_struct *session);
int agent_get_ident_count(struct ssh_session *session);
int agent_get_ident_count(struct ssh_session_struct *session);
struct ssh_public_key_struct *agent_get_next_ident(struct ssh_session *session,
struct ssh_public_key_struct *agent_get_next_ident(struct ssh_session_struct *session,
char **comment);
struct ssh_public_key_struct *agent_get_first_ident(struct ssh_session *session,
struct ssh_public_key_struct *agent_get_first_ident(struct ssh_session_struct *session,
char **comment);
ssh_string agent_sign_data(struct ssh_session *session,
ssh_string agent_sign_data(struct ssh_session_struct *session,
struct ssh_buffer_struct *data,
struct ssh_public_key_struct *pubkey);
#endif
@@ -676,7 +676,7 @@ ssh_public_key publickey_make_rsa(SSH_SESSION *session, ssh_buffer buffer, int t
ssh_public_key publickey_from_string(SSH_SESSION *session, ssh_string pubkey_s);
SIGNATURE *signature_from_string(SSH_SESSION *session, ssh_string signature,ssh_public_key pubkey,int needed_type);
void signature_free(SIGNATURE *sign);
ssh_string ssh_do_sign_with_agent(struct ssh_session *session,
ssh_string ssh_do_sign_with_agent(struct ssh_session_struct *session,
struct ssh_buffer_struct *buf, struct ssh_public_key_struct *publickey);
ssh_string ssh_do_sign(SSH_SESSION *session,ssh_buffer sigbuf,
ssh_private_key privatekey);

2
include/libssh/server.h
View File

@@ -174,7 +174,7 @@ int ssh_message_service_reply_success(SSH_MESSAGE *msg);
char *ssh_message_service_service(SSH_MESSAGE *msg);
void ssh_set_message_callback(SSH_SESSION *session,
int(*ssh_message_callback)(struct ssh_session *session, struct ssh_message *msg));
int(*ssh_message_callback)(ssh_session session, struct ssh_message *msg));
#ifdef __cplusplus
}
#endif /* __cplusplus */