Change refs from AGENT * to ssh_agent

Fixes also a typo in ssh_agent declaration

3 files changed, 7 insertions, 8 deletions

diff --git a/include/libssh/libssh.h b/include/libssh/libssh.h
index 73ea536..96687ce 100644
--- a/include/libssh/libssh.h
+++ b/include/libssh/libssh.h
@@ -77,9 +77,8 @@ typedef struct ssh_buffer_struct BUFFER;
 typedef struct ssh_public_key_struct PUBLIC_KEY;
 typedef struct ssh_private_key_struct PRIVATE_KEY;
 typedef struct ssh_channel_struct CHANNEL;
-#endif
 typedef struct ssh_agent_struct AGENT;
-//#endif
+#endif
 
 typedef struct ssh_options_struct SSH_OPTIONS;
 typedef struct ssh_session SSH_SESSION;
@@ -91,7 +90,7 @@ typedef struct ssh_public_key_struct* ssh_public_key;
 typedef struct ssh_private_key_struct* ssh_private_key;
 typedef struct ssh_options_struct* ssh_options;
 typedef struct ssh_channel_struct* ssh_channel;
-typedef struct ssh_agent_struct* ssh_agentT;
+typedef struct ssh_agent_struct* ssh_agent;
 typedef struct ssh_session* ssh_session;
 typedef struct ssh_kbdint* ssh_kbdint;
 
diff --git a/include/libssh/priv.h b/include/libssh/priv.h
index b951cbc..98fde99 100644
--- a/include/libssh/priv.h
+++ b/include/libssh/priv.h
@@ -382,7 +382,7 @@ struct ssh_session {
     int maxchannel;
     int exec_channel_opened; /* version 1 only. more
                                 info in channels1.c */
-    AGENT *agent; /* ssh agent */
+    ssh_agent agent; /* ssh agent */
 
 /* keyb interactive data */
     struct ssh_kbdint *kbdint;
diff --git a/libssh/agent.c b/libssh/agent.c
index ecc9b4d..3ef41e4 100644
--- a/libssh/agent.c
+++ b/libssh/agent.c
@@ -118,10 +118,10 @@ static size_t atomicio(struct socket *s, void *buf, size_t n, int do_read) {
   return pos;
 }
 
-AGENT *agent_new(struct ssh_session *session) {
-  AGENT *agent = NULL;
+ssh_agent agent_new(struct ssh_session *session) {
+  ssh_agent agent = NULL;
 
-  agent = malloc(sizeof(AGENT));
+  agent = malloc(sizeof(struct ssh_agent_struct));
   if (agent == NULL) {
     return NULL;
   }
@@ -147,7 +147,7 @@ void agent_close(struct ssh_agent_struct *agent) {
   }
 }
 
-void agent_free(AGENT *agent) {
+void agent_free(ssh_agent agent) {
   if (agent) {
     if (agent->ident) {
       buffer_free(agent->ident);