summaryrefslogtreecommitdiffstats
path: root/include/libssh
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2011-08-15 20:42:26 +0200
committerAndreas Schneider <asn@cryptomilk.org>2011-08-16 00:47:43 +0200
commit6c1b508efd5c8d5081d26d2c085f201ebeafaa0b (patch)
tree2fb2d664bfb3f4599068511af593fcbe018e2c02 /include/libssh
parent714fa8960d52c5154faa55f5bdd3784657636884 (diff)
downloadlibssh-6c1b508efd5c8d5081d26d2c085f201ebeafaa0b.tar.gz
libssh-6c1b508efd5c8d5081d26d2c085f201ebeafaa0b.tar.xz
libssh-6c1b508efd5c8d5081d26d2c085f201ebeafaa0b.zip
pki: Rename ssh_pki_import_pubkey_string and make it public.
It should be named ssh_pki_import_pubkey_blob().
Diffstat (limited to 'include/libssh')
-rw-r--r--include/libssh/libssh.h3
-rw-r--r--include/libssh/pki.h3
2 files changed, 3 insertions, 3 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index d0c02bf3..df06e840 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -437,6 +437,9 @@ LIBSSH_API int ssh_pki_import_pubkey_base64(ssh_session session,
const char *b64_key,
enum ssh_keytypes_e type,
ssh_key *pkey);
+LIBSSH_API int ssh_pki_import_pubkey_blob(ssh_session session,
+ const ssh_string key_blob,
+ ssh_key *pkey);
LIBSSH_API int ssh_userauth_pki_pubkey(ssh_session session, const char *username,
ssh_string publickey, ssh_key privatekey);
diff --git a/include/libssh/pki.h b/include/libssh/pki.h
index 2115b8b4..3dab1632 100644
--- a/include/libssh/pki.h
+++ b/include/libssh/pki.h
@@ -78,9 +78,6 @@ 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);
-int ssh_pki_import_pubkey_string(ssh_session session,
- const ssh_string pubkey,
- ssh_key *pkey);
struct signature_struct *pki_do_sign(const ssh_key privatekey,
const unsigned char *hash);