diff options
| author | Andreas Schneider <mail@cynapses.org> | 2010-02-28 22:51:21 +0100 |
|---|---|---|
| committer | Andreas Schneider <mail@cynapses.org> | 2010-03-06 12:33:27 +0100 |
| commit | 83c51d1c134a92df4a2bef52bcbfec42f3c8d49a (patch) | |
| tree | 4548e6259247b21175d5140e259300268867cc93 /include/libssh | |
| parent | c712d30311221c153cf5b3778651a73992c38719 (diff) | |
Fixed and added support for several identity files.
Diffstat (limited to 'include/libssh')
| -rw-r--r-- | include/libssh/libssh.h | 5 | ||||
| -rw-r--r-- | include/libssh/misc.h | 1 | ||||
| -rw-r--r-- | include/libssh/session.h | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index fe75bfdc..fa4d1d83 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -252,6 +252,7 @@ enum ssh_options_e { SSH_OPTIONS_USER, SSH_OPTIONS_SSH_DIR, SSH_OPTIONS_IDENTITY, + SSH_OPTIONS_ADD_IDENTITY, SSH_OPTIONS_KNOWNHOSTS, SSH_OPTIONS_TIMEOUT, SSH_OPTIONS_TIMEOUT_USEC, @@ -335,10 +336,14 @@ LIBSSH_API void privatekey_free(ssh_private_key prv); LIBSSH_API ssh_private_key privatekey_from_file(ssh_session session, const char *filename, int type, const char *passphrase); LIBSSH_API void publickey_free(ssh_public_key key); +LIBSSH_API int ssh_publickey_to_file(ssh_session session, const char *file, + ssh_string pubkey, int type); LIBSSH_API ssh_string publickey_from_file(ssh_session session, const char *filename, int *type); LIBSSH_API ssh_public_key publickey_from_privatekey(ssh_private_key prv); LIBSSH_API ssh_string publickey_to_string(ssh_public_key key); +LIBSSH_API int ssh_try_publickey_from_file(ssh_session session, const char *keyfile, + ssh_string *publickey, int *type); LIBSSH_API int ssh_auth_list(ssh_session session); LIBSSH_API char *ssh_basename (const char *path); diff --git a/include/libssh/misc.h b/include/libssh/misc.h index 647faedc..ddd72fe7 100644 --- a/include/libssh/misc.h +++ b/include/libssh/misc.h @@ -25,6 +25,7 @@ /* in misc.c */ /* gets the user home dir. */ char *ssh_get_user_home_dir(void); +char *ssh_get_local_username(ssh_session session); int ssh_file_readaccess_ok(const char *file); /* macro for byte ordering */ diff --git a/include/libssh/session.h b/include/libssh/session.h index f490b1e4..9bd97315 100644 --- a/include/libssh/session.h +++ b/include/libssh/session.h @@ -104,7 +104,7 @@ struct ssh_session_struct { char *host; char *bindaddr; /* TODO: check if needed */ char *xbanner; /* TODO: looks like it is not needed */ - char *identity; + struct ssh_list *identity; char *sshdir; char *knownhosts; char *wanted_methods[10]; |