diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2011-08-23 19:01:22 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2011-08-23 21:54:02 +0200 |
| commit | aa018c1484ce053bf88dbe066988b5e39a2c0317 (patch) | |
| tree | e33235f8ab9ea59af7d361a3655a1e5ea2f81aeb /include/libssh | |
| parent | 37df5e17c310c438eefaf5150bad55ad12a7d64f (diff) | |
| download | libssh-aa018c1484ce053bf88dbe066988b5e39a2c0317.tar.gz libssh-aa018c1484ce053bf88dbe066988b5e39a2c0317.tar.xz libssh-aa018c1484ce053bf88dbe066988b5e39a2c0317.zip | |
auth: Make ssh_userauth_try_publickey() legacy.
Diffstat (limited to 'include/libssh')
| -rw-r--r-- | include/libssh/legacy.h | 1 | ||||
| -rw-r--r-- | include/libssh/libssh.h | 1 | ||||
| -rw-r--r-- | include/libssh/libsshpp.hpp | 6 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/libssh/legacy.h b/include/libssh/legacy.h index 80b8fac6..1905e89d 100644 --- a/include/libssh/legacy.h +++ b/include/libssh/legacy.h @@ -31,6 +31,7 @@ #ifndef LEGACY_H_ #define LEGACY_H_ LIBSSH_API int ssh_auth_list(ssh_session session); +LIBSSH_API int ssh_userauth_offer_pubkey(ssh_session session, const char *username, int type, ssh_string publickey); LIBSSH_API void buffer_free(ssh_buffer buffer); LIBSSH_API void *buffer_get(ssh_buffer buffer); diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index f37f8395..89c42585 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -512,7 +512,6 @@ LIBSSH_API int ssh_userauth_kbdint_getnanswers(ssh_session session); LIBSSH_API const char *ssh_userauth_kbdint_getanswer(ssh_session session, unsigned int i); LIBSSH_API int ssh_userauth_kbdint_setanswer(ssh_session session, unsigned int i, const char *answer); -LIBSSH_API int ssh_userauth_offer_pubkey(ssh_session session, const char *username, int type, ssh_string publickey); LIBSSH_API int ssh_userauth_password(ssh_session session, const char *username, const char *password); LIBSSH_API int ssh_userauth_pubkey(ssh_session session, const char *username, ssh_string publickey, ssh_private_key privatekey); LIBSSH_API int ssh_userauth_privatekey_file(ssh_session session, const char *username, diff --git a/include/libssh/libsshpp.hpp b/include/libssh/libsshpp.hpp index 03101d38..3c82e587 100644 --- a/include/libssh/libsshpp.hpp +++ b/include/libssh/libsshpp.hpp @@ -211,10 +211,10 @@ public: * @throws SshException on error * @returns SSH_AUTH_SUCCESS if the pubkey is accepted, * @returns SSH_AUTH_DENIED if the pubkey is denied - * @see ssh_userauth_offer_pubkey + * @see ssh_userauth_try_pubkey */ - int userauthOfferPubkey(int type, ssh_string pubkey){ - int ret=ssh_userauth_offer_pubkey(c_session,NULL,type,pubkey); + int userauthTryPublickey(ssh_key pubkey){ + int ret=ssh_userauth_try_publickey(c_session, NULL, pubkey); ssh_throw(ret); return ret; } |