summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/libssh/libssh.h4
-rw-r--r--include/libssh/priv.h2
-rw-r--r--libssh/auth.c2
-rw-r--r--libssh/keyfiles.c2
4 files changed, 5 insertions, 5 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index d3ca82e..043ae17 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 66b0e83..46c13d8 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 8ad1310..20c8f00 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 ad456cd..daed48b 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;