Change PRIVATE_KEY * to ssh_private_key

2 files changed, 13 insertions, 13 deletions

diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index 45dcffe..6124c7d 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -75,8 +75,8 @@ extern "C" {
 typedef struct ssh_string_struct STRING;
 typedef struct ssh_buffer_struct BUFFER;
 typedef struct ssh_public_key_struct PUBLIC_KEY;
-#endif
 typedef struct ssh_private_key_struct PRIVATE_KEY;
+#endif
 typedef struct ssh_channel_struct CHANNEL;
 typedef struct ssh_agent_struct AGENT;
 //#endif
@@ -264,11 +264,11 @@ void publickey_free(ssh_public_key key);
 
 /* in keyfiles.c */
 
-PRIVATE_KEY *privatekey_from_file(SSH_SESSION *session, const char *filename,
+ssh_private_key privatekey_from_file(SSH_SESSION *session, const char *filename,
     int type, const char *passphrase);
 ssh_string publickey_to_string(ssh_public_key key);
-ssh_public_key publickey_from_privatekey(PRIVATE_KEY *prv);
-void privatekey_free(PRIVATE_KEY *prv);
+ssh_public_key publickey_from_privatekey(ssh_private_key prv);
+void privatekey_free(ssh_private_key prv);
 ssh_string publickey_from_file(SSH_SESSION *session, const char *filename,
     int *type);
 int ssh_is_server_known(SSH_SESSION *session);
@@ -375,7 +375,7 @@ int ssh_userauth_list(SSH_SESSION *session, const char *username);
 int ssh_userauth_none(SSH_SESSION *session, const char *username);
 int ssh_userauth_password(SSH_SESSION *session, const char *username, const char *password);
 int ssh_userauth_offer_pubkey(SSH_SESSION *session, const char *username, int type, ssh_string publickey);
-int ssh_userauth_pubkey(SSH_SESSION *session, const char *username, ssh_string publickey, PRIVATE_KEY *privatekey);
+int ssh_userauth_pubkey(SSH_SESSION *session, const char *username, ssh_string publickey, ssh_private_key privatekey);
 int ssh_userauth_agent_pubkey(SSH_SESSION *session, const char *username,
     ssh_public_key publickey);
 int ssh_userauth_autopubkey(SSH_SESSION *session, const char *passphrase);
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index 79d2783..be7185d 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -388,8 +388,8 @@ struct ssh_session {
     struct ssh_kbdint *kbdint;
     int version; /* 1 or 2 */
     /* server host keys */
-    PRIVATE_KEY *rsa_key;
-    PRIVATE_KEY *dsa_key;
+    ssh_private_key rsa_key;
+    ssh_private_key dsa_key;
     /* auths accepted by server */
     int auth_methods;
     int hostkeys; /* contains type of host key wanted by client, in server impl */
@@ -650,7 +650,7 @@ char *ssh_find_matching(const char *in_d, const char *what_d);
 
 /* in keyfiles.c */
 
-PRIVATE_KEY *_privatekey_from_file(void *session, const char *filename,
+ssh_private_key _privatekey_from_file(void *session, const char *filename,
     int type);
 ssh_string try_publickey_from_file(SSH_SESSION *session,
     struct ssh_keys_struct keytab,
@@ -660,10 +660,10 @@ ssh_string try_publickey_from_file(SSH_SESSION *session,
 const char *ssh_type_to_char(int type);
 int ssh_type_from_name(const char *name);
 
-PRIVATE_KEY *privatekey_make_dss(SSH_SESSION *session, ssh_buffer buffer);
-PRIVATE_KEY *privatekey_make_rsa(SSH_SESSION *session, ssh_buffer buffer,
+ssh_private_key privatekey_make_dss(SSH_SESSION *session, ssh_buffer buffer);
+ssh_private_key privatekey_make_rsa(SSH_SESSION *session, ssh_buffer buffer,
     const char *type);
-PRIVATE_KEY *privatekey_from_string(SSH_SESSION *session, ssh_string privkey_s);
+ssh_private_key privatekey_from_string(SSH_SESSION *session, ssh_string privkey_s);
 
 ssh_public_key publickey_make_dss(SSH_SESSION *session, ssh_buffer buffer);
 ssh_public_key publickey_make_rsa(SSH_SESSION *session, ssh_buffer buffer, int type);
@@ -673,8 +673,8 @@ void signature_free(SIGNATURE *sign);
 ssh_string ssh_do_sign_with_agent(struct ssh_session *session,
     struct ssh_buffer_struct *buf, struct ssh_public_key_struct *publickey);
 ssh_string ssh_do_sign(SSH_SESSION *session,ssh_buffer sigbuf,
-        PRIVATE_KEY *privatekey);
-ssh_string ssh_sign_session_id(SSH_SESSION *session, PRIVATE_KEY *privatekey);
+        ssh_private_key privatekey);
+ssh_string ssh_sign_session_id(SSH_SESSION *session, ssh_private_key privatekey);
 ssh_string ssh_encrypt_rsa1(SSH_SESSION *session, ssh_string data, ssh_public_key key);
 /* channel.c */
 void channel_handle(SSH_SESSION *session, int type);