Changed all PUBLIC_KEY * to ssh_public_key

2 files changed, 10 insertions, 10 deletions

diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index fc0bca9c..45dcffe3 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -74,8 +74,8 @@ extern "C" {
 #ifdef SSH_SAFE_NAMESPACE
 typedef struct ssh_string_struct STRING;
 typedef struct ssh_buffer_struct BUFFER;
-#endif
 typedef struct ssh_public_key_struct PUBLIC_KEY;
+#endif
 typedef struct ssh_private_key_struct PRIVATE_KEY;
 typedef struct ssh_channel_struct CHANNEL;
 typedef struct ssh_agent_struct AGENT;
@@ -260,14 +260,14 @@ int ssh_fd_poll(SSH_SESSION *session,int *write, int *except);
 int ssh_select(CHANNEL **channels, CHANNEL **outchannels, socket_t maxfd,
     fd_set *readfds, struct timeval *timeout);
 
-void publickey_free(PUBLIC_KEY *key);
+void publickey_free(ssh_public_key key);
 
 /* in keyfiles.c */
 
 PRIVATE_KEY *privatekey_from_file(SSH_SESSION *session, const char *filename,
     int type, const char *passphrase);
-ssh_string publickey_to_string(PUBLIC_KEY *key);
-PUBLIC_KEY *publickey_from_privatekey(PRIVATE_KEY *prv);
+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_string publickey_from_file(SSH_SESSION *session, const char *filename,
     int *type);
@@ -377,7 +377,7 @@ int ssh_userauth_password(SSH_SESSION *session, const char *username, const char
 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_agent_pubkey(SSH_SESSION *session, const char *username,
-    PUBLIC_KEY *publickey);
+    ssh_public_key publickey);
 int ssh_userauth_autopubkey(SSH_SESSION *session, const char *passphrase);
 int ssh_userauth_kbdint(SSH_SESSION *session, const char *user, const char *submethods);
 int ssh_userauth_kbdint_getnprompts(SSH_SESSION *session);
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index ab7d8920..79d27836 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -665,17 +665,17 @@ 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);
 
-PUBLIC_KEY *publickey_make_dss(SSH_SESSION *session, ssh_buffer buffer);
-PUBLIC_KEY *publickey_make_rsa(SSH_SESSION *session, ssh_buffer buffer, int type);
-PUBLIC_KEY *publickey_from_string(SSH_SESSION *session, ssh_string pubkey_s);
-SIGNATURE *signature_from_string(SSH_SESSION *session, ssh_string signature,PUBLIC_KEY *pubkey,int needed_type);
+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);
+ssh_public_key publickey_from_string(SSH_SESSION *session, ssh_string pubkey_s);
+SIGNATURE *signature_from_string(SSH_SESSION *session, ssh_string signature,ssh_public_key pubkey,int needed_type);
 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_string ssh_encrypt_rsa1(SSH_SESSION *session, ssh_string data, PUBLIC_KEY *key);
+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);
 CHANNEL *channel_new(SSH_SESSION *session);