aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormilo <milo@r0ot.me>2011-03-09 00:51:50 +0100
committermilo <milo@r0ot.me>2011-03-17 11:41:50 +0100
commitd9694b9c5d25fda42a6a1f308b016fd68c28ee0d (patch)
tree512d27dae01dacfb71109bd231f6d7f2787d1eeb
parent633d6532beb8cb8bd4f44732177499d4023fe624 (diff)
downloadlibssh-d9694b9c5d25fda42a6a1f308b016fd68c28ee0d.tar.gz
libssh-d9694b9c5d25fda42a6a1f308b016fd68c28ee0d.tar.xz
libssh-d9694b9c5d25fda42a6a1f308b016fd68c28ee0d.zip
[pki] Make ssh_key_new and ssh_key_free public
-rw-r--r--include/libssh/libssh.h2
-rw-r--r--include/libssh/pki.h2
-rw-r--r--src/pki.c1
3 files changed, 3 insertions, 2 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index 504aac9..7a4060e 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -411,6 +411,8 @@ LIBSSH_API int ssh_pcap_file_open(ssh_pcap_file pcap, const char *filename);
LIBSSH_API enum ssh_keytypes_e ssh_privatekey_type(ssh_private_key privatekey);
+LIBSSH_API ssh_key ssh_key_new(void);
+LIBSSH_API void ssh_key_free (ssh_key key);
LIBSSH_API void ssh_print_hexa(const char *descr, const unsigned char *what, size_t len);
LIBSSH_API int ssh_scp_accept_request(ssh_scp scp);
LIBSSH_API int ssh_scp_close(ssh_scp scp);
diff --git a/include/libssh/pki.h b/include/libssh/pki.h
index 21a58a0..73f02ec 100644
--- a/include/libssh/pki.h
+++ b/include/libssh/pki.h
@@ -39,11 +39,9 @@ struct ssh_key_struct {
#endif
};
-ssh_key ssh_key_new (void);
void ssh_key_clean (ssh_key key);
enum ssh_keytypes_e ssh_key_type(ssh_key key);
int ssh_key_import_private(ssh_key key, ssh_session session,
const char *filename, const char *passphrase);
-void ssh_key_free (ssh_key key);
#endif /* PKI_H_ */
diff --git a/src/pki.c b/src/pki.c
index 0376ac2..aec7690 100644
--- a/src/pki.c
+++ b/src/pki.c
@@ -30,6 +30,7 @@
* @{
*/
+#include "libssh/libssh.h"
#include "libssh/priv.h"
#include "libssh/pki.h"
#include "libssh/keys.h"