diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2011-06-15 18:27:23 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2011-06-15 18:27:23 +0200 |
| commit | f684e76ab224869b1a4db07cd1256876f4a71bae (patch) | |
| tree | 22c3f1ff5b0d8d078553cf6bd7f5d75026a6a479 /include/libssh | |
| parent | 3ba44badb00f7315dbe30aee7f5b75568fd1b0b7 (diff) | |
| parent | c75581fb939e5be9ea51c1741e57b75626da03a3 (diff) | |
| download | libssh-f684e76ab224869b1a4db07cd1256876f4a71bae.tar.gz libssh-f684e76ab224869b1a4db07cd1256876f4a71bae.tar.xz libssh-f684e76ab224869b1a4db07cd1256876f4a71bae.zip | |
Merge branch 'pki'
Diffstat (limited to 'include/libssh')
| -rw-r--r-- | include/libssh/libssh.h | 3 | ||||
| -rw-r--r-- | include/libssh/pki.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h index 34531777..e6f08472 100644 --- a/include/libssh/libssh.h +++ b/include/libssh/libssh.h @@ -422,6 +422,9 @@ LIBSSH_API void ssh_key_free (ssh_key key); LIBSSH_API enum ssh_keytypes_e ssh_key_type(ssh_key key); LIBSSH_API const char *ssh_key_type_to_char(enum ssh_keytypes_e type); LIBSSH_API enum ssh_keytypes_e ssh_key_type_from_name(const char *name); +LIBSSH_API int ssh_key_is_public(ssh_key k); +LIBSSH_API int ssh_key_is_private(ssh_key k); + LIBSSH_API int ssh_pki_import_privkey_base64(ssh_key key, ssh_session session, const char *b64_key, const char *passphrase); LIBSSH_API int ssh_userauth_pki_pubkey(ssh_session session, const char *username, diff --git a/include/libssh/pki.h b/include/libssh/pki.h index 06c933cc..8d3ef0c9 100644 --- a/include/libssh/pki.h +++ b/include/libssh/pki.h @@ -39,9 +39,6 @@ struct ssh_key_struct { #endif }; -#define ssh_key_is_public(k) (k && k->flags & SSH_KEY_FLAG_PUBLIC) -#define ssh_key_is_private(k) (k && k->flags & SSH_KEY_FLAG_PRIVATE) - void ssh_key_clean (ssh_key key); int ssh_key_import_private(ssh_key key, ssh_session session, const char *filename, const char *passphrase); |