From f55cd7de431018bc1799aa9616006569d90f0fcc Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Sun, 7 Aug 2011 15:00:35 +0200 Subject: pki: Improve ssh_key_import_private(). --- include/libssh/libssh.h | 4 ++++ include/libssh/pki.h | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'include/libssh') diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index 577ddb7..7357129 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -429,6 +429,10 @@ 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_key_import_private(ssh_session session, + const char *filename, + 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 32e084f..dd62989 100644 --- a/include/libssh/pki.h +++ b/include/libssh/pki.h @@ -47,8 +47,6 @@ struct ssh_key_struct { }; void ssh_key_clean (ssh_key key); -int ssh_key_import_private(ssh_key key, ssh_session session, - const char *filename, const char *passphrase); ssh_key ssh_pki_publickey_from_privatekey(ssh_key privkey); ssh_string ssh_pki_do_sign(ssh_session session, ssh_buffer sigbuf, @@ -62,4 +60,5 @@ 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