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

replacing keys_struct with ssh_keys_struct

Browse Source
This commit is contained in:
Aris Adamantiadis
2009-07-24 21:18:15 +02:00
parent e776dc16c9
commit 958a775afa
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/libssh/libssh.h
View File

@@ -80,7 +80,7 @@ typedef struct ssh_channel_struct CHANNEL;
typedef struct ssh_agent_struct AGENT; typedef struct ssh_agent_struct AGENT;
typedef struct ssh_session SSH_SESSION; typedef struct ssh_session SSH_SESSION;
typedef struct ssh_kbdint SSH_KBDINT; typedef struct ssh_kbdint SSH_KBDINT;
struct keys_struct; struct ssh_keys_struct;
/* integer values */ /* integer values */
typedef uint32_t u32; typedef uint32_t u32;
@@ -258,7 +258,7 @@ void privatekey_free(PRIVATE_KEY *prv);
STRING *publickey_from_file(SSH_SESSION *session, const char *filename, STRING *publickey_from_file(SSH_SESSION *session, const char *filename,
int *type); int *type);
STRING *try_publickey_from_file(SSH_SESSION *session, STRING *try_publickey_from_file(SSH_SESSION *session,
struct keys_struct keytab, struct ssh_keys_struct keytab,
char **privkeyfile, int *type); char **privkeyfile, int *type);
int ssh_is_server_known(SSH_SESSION *session); int ssh_is_server_known(SSH_SESSION *session);
int ssh_write_knownhost(SSH_SESSION *session); int ssh_write_knownhost(SSH_SESSION *session);

2
include/libssh/priv.h
View File

@@ -324,7 +324,7 @@ struct ssh_agent_struct {
unsigned int count; unsigned int count;
}; };
struct keys_struct { struct ssh_keys_struct {
const char *privatekey; const char *privatekey;
const char *publickey; const char *publickey;
}; };

2
libssh/auth.c
View File

@@ -750,7 +750,7 @@ error:
return rc; return rc;
} }
static struct keys_struct keytab[] = { static struct ssh_keys_struct keytab[] = {
{ {
.privatekey = "%s/.ssh/identity", .privatekey = "%s/.ssh/identity",
.publickey = "%s/.ssh/identity.pub" .publickey = "%s/.ssh/identity.pub"

2
libssh/keyfiles.c
View File

@@ -922,7 +922,7 @@ STRING *publickey_from_file(SSH_SESSION *session, const char *filename,
return str; return str;
} }
STRING *try_publickey_from_file(SSH_SESSION *session, struct keys_struct keytab, STRING *try_publickey_from_file(SSH_SESSION *session, struct ssh_keys_struct keytab,
char **privkeyfile, int *type) { char **privkeyfile, int *type) {
static char *home = NULL; static char *home = NULL;