From 9569d053d8f419ebd7fcdecd2c6e18ff86e34c86 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sun, 7 Aug 2011 14:00:42 +0200 Subject: pki: Improve ssh_pki_import_privkey_base64(). --- include/libssh/libssh.h | 6 ++++-- include/libssh/pki.h | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'include/libssh') diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index e6f08472..577ddb71 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -425,8 +425,10 @@ LIBSSH_API enum ssh_keytypes_e ssh_key_type_from_name(const char *name); LIBSSH_API int ssh_key_is_public(ssh_key k); LIBSSH_API int ssh_key_is_private(ssh_key k); -LIBSSH_API int ssh_pki_import_privkey_base64(ssh_key key, ssh_session session, - const char *b64_key, const char *passphrase); +LIBSSH_API int ssh_pki_import_privkey_base64(ssh_session session, + const char *b64_key, + const char *passphrase, + ssh_key *pkey); LIBSSH_API int ssh_userauth_pki_pubkey(ssh_session session, const char *username, ssh_string publickey, ssh_key privatekey); LIBSSH_API void ssh_print_hexa(const char *descr, const unsigned char *what, size_t len); diff --git a/include/libssh/pki.h b/include/libssh/pki.h index 463f614f..32e084f4 100644 --- a/include/libssh/pki.h +++ b/include/libssh/pki.h @@ -59,4 +59,7 @@ ssh_public_key ssh_pki_convert_key_to_publickey(ssh_key key); enum ssh_keytypes_e pki_privatekey_type_from_string(const char *privkey); +ssh_key pki_private_key_from_base64(ssh_session session, + const char *b64_key, + const char *passphrase); #endif /* PKI_H_ */ -- cgit