diff options
Diffstat (limited to 'include/libssh/libssh.h')
| -rw-r--r-- | include/libssh/libssh.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index fc0bca9..45dcffe 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -74,8 +74,8 @@ extern "C" { #ifdef SSH_SAFE_NAMESPACE typedef struct ssh_string_struct STRING; typedef struct ssh_buffer_struct BUFFER; -#endif typedef struct ssh_public_key_struct PUBLIC_KEY; +#endif typedef struct ssh_private_key_struct PRIVATE_KEY; typedef struct ssh_channel_struct CHANNEL; typedef struct ssh_agent_struct AGENT; @@ -260,14 +260,14 @@ int ssh_fd_poll(SSH_SESSION *session,int *write, int *except); int ssh_select(CHANNEL **channels, CHANNEL **outchannels, socket_t maxfd, fd_set *readfds, struct timeval *timeout); -void publickey_free(PUBLIC_KEY *key); +void publickey_free(ssh_public_key key); /* in keyfiles.c */ PRIVATE_KEY *privatekey_from_file(SSH_SESSION *session, const char *filename, int type, const char *passphrase); -ssh_string publickey_to_string(PUBLIC_KEY *key); -PUBLIC_KEY *publickey_from_privatekey(PRIVATE_KEY *prv); +ssh_string publickey_to_string(ssh_public_key key); +ssh_public_key publickey_from_privatekey(PRIVATE_KEY *prv); void privatekey_free(PRIVATE_KEY *prv); ssh_string publickey_from_file(SSH_SESSION *session, const char *filename, int *type); @@ -377,7 +377,7 @@ int ssh_userauth_password(SSH_SESSION *session, const char *username, const char int ssh_userauth_offer_pubkey(SSH_SESSION *session, const char *username, int type, ssh_string publickey); int ssh_userauth_pubkey(SSH_SESSION *session, const char *username, ssh_string publickey, PRIVATE_KEY *privatekey); int ssh_userauth_agent_pubkey(SSH_SESSION *session, const char *username, - PUBLIC_KEY *publickey); + ssh_public_key publickey); int ssh_userauth_autopubkey(SSH_SESSION *session, const char *passphrase); int ssh_userauth_kbdint(SSH_SESSION *session, const char *user, const char *submethods); int ssh_userauth_kbdint_getnprompts(SSH_SESSION *session); |