summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <mail@cynapses.org>2009-07-29 17:40:17 +0200
committerAndreas Schneider <mail@cynapses.org>2009-07-29 17:40:17 +0200
commitad86a378d9ef7eff8131a0495ca36ceb6a6eace0 (patch)
tree9fbce2825eb9aa71ff11a151c6e715a3d4230933
parented660c29c348eb2f7f2af21fa562589561cb35f1 (diff)
downloadlibssh-ad86a378d9ef7eff8131a0495ca36ceb6a6eace0.tar.gz
libssh-ad86a378d9ef7eff8131a0495ca36ceb6a6eace0.tar.xz
libssh-ad86a378d9ef7eff8131a0495ca36ceb6a6eace0.zip
moved try_publickey_from_file in priv.h
Had nothing to do in libssh.h. 100% sure nobody used it since one of the structure declaration was not public.
-rw-r--r--include/libssh/libssh.h4
-rw-r--r--include/libssh/priv.h3
2 files changed, 3 insertions, 4 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index f4dbe126..6c024649 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -80,7 +80,6 @@ typedef struct channel_struct CHANNEL;
typedef struct agent_struct AGENT;
typedef struct ssh_session SSH_SESSION;
typedef struct ssh_kbdint SSH_KBDINT;
-struct keys_struct;
/* integer values */
typedef uint32_t u32;
@@ -258,9 +257,6 @@ PUBLIC_KEY *publickey_from_privatekey(PRIVATE_KEY *prv);
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,
- 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 b01b4e93..01a6a858 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -608,6 +608,9 @@ char *ssh_find_matching(const char *in_d, const char *what_d);
PRIVATE_KEY *_privatekey_from_file(void *session, const char *filename,
int type);
+STRING *try_publickey_from_file(SSH_SESSION *session,
+ struct keys_struct keytab,
+ char **privkeyfile, int *type);
/* in keys.c */
const char *ssh_type_to_char(int type);