aboutsummaryrefslogtreecommitdiff
path: root/include/libssh/pki.h
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-08-16 18:53:18 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-08-16 18:53:18 +0200
commit25a21088090dcb18ef6f0b12a47bd1db6b871153 (patch)
tree53ce5494c0dc3157fb445aa6f0ab4b89142553b8 /include/libssh/pki.h
parent9b84464748d5d4cd67b7868a6cfba5664a169503 (diff)
downloadlibssh-25a21088090dcb18ef6f0b12a47bd1db6b871153.tar.gz
libssh-25a21088090dcb18ef6f0b12a47bd1db6b871153.tar.xz
libssh-25a21088090dcb18ef6f0b12a47bd1db6b871153.zip
pki: Remove session from ssh_pki_import_privkey_* functions.
Diffstat (limited to 'include/libssh/pki.h')
-rw-r--r--include/libssh/pki.h9
1 files changed, 6 insertions, 3 deletions
diff --git a/include/libssh/pki.h b/include/libssh/pki.h
index 2e9107c6..60bac978 100644
--- a/include/libssh/pki.h
+++ b/include/libssh/pki.h
@@ -46,6 +46,8 @@ struct ssh_key_struct {
void *cert;
};
+void ssh_pki_log(const char *format, ...);
+
/* internal pki functions */
ssh_key pki_key_dup(const ssh_key key, int demote);
@@ -74,9 +76,10 @@ ssh_public_key ssh_pki_convert_key_to_publickey(ssh_key key);
ssh_private_key ssh_pki_convert_key_to_privatekey(ssh_key key);
-ssh_key pki_private_key_from_base64(ssh_session session,
- const char *b64_key,
- const char *passphrase);
+ssh_key pki_private_key_from_base64(const char *b64_key,
+ const char *passphrase,
+ ssh_auth_callback auth_fn,
+ void *auth_data);
struct signature_struct *pki_do_sign(const ssh_key privatekey,
const unsigned char *hash);