diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2011-08-16 19:33:24 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2011-08-16 19:33:24 +0200 |
| commit | 254c30be2e97812a892c96210491720d63538994 (patch) | |
| tree | fd2eb1e707dff650317ccd0d14a059aa03351d3b /include | |
| parent | 25a21088090dcb18ef6f0b12a47bd1db6b871153 (diff) | |
| download | libssh-254c30be2e97812a892c96210491720d63538994.tar.gz libssh-254c30be2e97812a892c96210491720d63538994.tar.xz libssh-254c30be2e97812a892c96210491720d63538994.zip | |
pki: Remove session from ssh_pki_import_pubkey_* functions.
Diffstat (limited to 'include')
| -rw-r--r-- | include/libssh/libssh.h | 10 | ||||
| -rw-r--r-- | include/libssh/pki.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index 3acb5aef..80121b7f 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -452,17 +452,11 @@ LIBSSH_API int ssh_pki_import_privkey_file(const char *filename, void *auth_data, ssh_key *pkey); -LIBSSH_API int ssh_pki_import_pubkey_base64(ssh_session session, - const char *b64_key, +LIBSSH_API int ssh_pki_import_pubkey_base64(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, +LIBSSH_API int ssh_pki_import_pubkey_file(const char *filename, ssh_key *pkey); -LIBSSH_API int ssh_pki_import_pubkey_file(ssh_session session, - const char *filename, - ssh_key *pkey); -LIBSSH_API ssh_string ssh_pki_publickey_to_blob(const ssh_key key); LIBSSH_API int ssh_pki_publickey_to_base64(const ssh_key key, unsigned char **b64_key, enum ssh_keytypes_e *ptype); diff --git a/include/libssh/pki.h b/include/libssh/pki.h index 60bac978..429dd168 100644 --- a/include/libssh/pki.h +++ b/include/libssh/pki.h @@ -68,6 +68,12 @@ ssh_key ssh_key_dup(const ssh_key key); void ssh_key_clean (ssh_key key); ssh_key ssh_pki_publickey_from_privatekey(const ssh_key privkey); + +int ssh_pki_import_pubkey_blob(const ssh_string key_blob, + ssh_key *pkey); + +ssh_string ssh_pki_publickey_to_blob(const ssh_key key); + ssh_string ssh_pki_do_sign(ssh_session session, ssh_buffer sigbuf, ssh_key privatekey); |