diff options
| author | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-07-24 21:18:15 +0200 |
|---|---|---|
| committer | Aris Adamantiadis <aris@0xbadc0de.be> | 2009-07-24 21:18:15 +0200 |
| commit | 958a775afaf95837c78bfe3ef5941aaeede26ddc (patch) | |
| tree | 95968abff65dd0013fe4d7c4585caf7365e3a881 | |
| parent | e776dc16c958c71a83dffe06a85b5f98f3226e82 (diff) | |
| download | libssh-958a775afaf95837c78bfe3ef5941aaeede26ddc.tar.gz libssh-958a775afaf95837c78bfe3ef5941aaeede26ddc.tar.xz libssh-958a775afaf95837c78bfe3ef5941aaeede26ddc.zip | |
replacing keys_struct with ssh_keys_struct
| -rw-r--r-- | include/libssh/libssh.h | 4 | ||||
| -rw-r--r-- | include/libssh/priv.h | 2 | ||||
| -rw-r--r-- | libssh/auth.c | 2 | ||||
| -rw-r--r-- | libssh/keyfiles.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index d3ca82e4..043ae173 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -80,7 +80,7 @@ typedef struct ssh_channel_struct CHANNEL; typedef struct ssh_agent_struct AGENT; typedef struct ssh_session SSH_SESSION; typedef struct ssh_kbdint SSH_KBDINT; -struct keys_struct; +struct ssh_keys_struct; /* integer values */ typedef uint32_t u32; @@ -258,7 +258,7 @@ void privatekey_free(PRIVATE_KEY *prv); STRING *publickey_from_file(SSH_SESSION *session, const char *filename, int *type); STRING *try_publickey_from_file(SSH_SESSION *session, - struct keys_struct keytab, + struct ssh_keys_struct keytab, char **privkeyfile, int *type); int ssh_is_server_known(SSH_SESSION *session); int ssh_write_knownhost(SSH_SESSION *session); diff --git a/include/libssh/priv.h b/include/libssh/priv.h index 66b0e831..46c13d81 100644 --- a/include/libssh/priv.h +++ b/include/libssh/priv.h @@ -324,7 +324,7 @@ struct ssh_agent_struct { unsigned int count; }; -struct keys_struct { +struct ssh_keys_struct { const char *privatekey; const char *publickey; }; diff --git a/libssh/auth.c b/libssh/auth.c index 8ad1310e..20c8f007 100644 --- a/libssh/auth.c +++ b/libssh/auth.c @@ -750,7 +750,7 @@ error: return rc; } -static struct keys_struct keytab[] = { +static struct ssh_keys_struct keytab[] = { { .privatekey = "%s/.ssh/identity", .publickey = "%s/.ssh/identity.pub" diff --git a/libssh/keyfiles.c b/libssh/keyfiles.c index ad456cdf..daed48bf 100644 --- a/libssh/keyfiles.c +++ b/libssh/keyfiles.c @@ -922,7 +922,7 @@ STRING *publickey_from_file(SSH_SESSION *session, const char *filename, 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) { static char *home = NULL; |