- markus@cvs.openbsd.org 2001/03/17 17:27:59

[openssh.git] / authfd.h

diff --git a/authfd.h b/authfd.h
index 808575cd8b26845247fa1952b2325cda3e17f44b..29d1847b5ee1a99197eed40ab3359993f2591c9d 100644 (file)
--- a/authfd.h
+++ b/authfd.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: authfd.h,v 1.12 2000/09/21 11:07:51 markus Exp $"); */
+/* RCSID("$OpenBSD: authfd.h,v 1.16 2000/12/20 19:37:21 markus Exp $"); */
 
 #ifndef AUTHFD_H
 #define AUTHFD_H
@@ -29,6 +29,7 @@
 #define SSH_AGENTC_REMOVE_RSA_IDENTITY         8
 #define SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES   9
 
+/* private OpenSSH extensions for SSH2 */
 #define SSH2_AGENTC_REQUEST_IDENTITIES         11
 #define SSH2_AGENT_IDENTITIES_ANSWER           12
 #define SSH2_AGENTC_SIGN_REQUEST               13
@@ -37,6 +38,9 @@
 #define SSH2_AGENTC_REMOVE_IDENTITY            18
 #define SSH2_AGENTC_REMOVE_ALL_IDENTITIES      19
 
+/* additional error code for ssh.com's ssh-agent2 */
+#define SSH_COM_AGENT2_FAILURE                   102
+
 #define        SSH_AGENT_OLD_SIGNATURE                 0x01
 
 
@@ -47,7 +51,7 @@ typedef struct {
 }       AuthenticationConnection;
 
 /* Returns the number of the authentication fd, or -1 if there is none. */
-int     ssh_get_authentication_socket();
+int     ssh_get_authentication_socket(void);
 
 /*
  * This should be called for any descriptor returned by
@@ -62,7 +66,7 @@ void    ssh_close_authentication_socket(int authfd);
  * connection could not be opened.  The connection should be closed by the
  * caller by calling ssh_close_authentication_connection().
  */
-AuthenticationConnection *ssh_get_authentication_connection();
+AuthenticationConnection *ssh_get_authentication_connection(void);
 
 /*
  * Closes the connection to the authentication agent and frees any associated
@@ -70,6 +74,11 @@ AuthenticationConnection *ssh_get_authentication_connection();
  */
 void    ssh_close_authentication_connection(AuthenticationConnection *auth);
 
+/*
+ * Returns the number authentication identity held by the agent.
+ */
+int    ssh_get_num_identities(AuthenticationConnection *auth, int version);
+
 /*
  * Returns the first authentication identity held by the agent or NULL if
  * no identies are available. Caller must free comment and key.
@@ -92,16 +101,16 @@ Key        *ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int v
 int
 ssh_decrypt_challenge(AuthenticationConnection *auth,
     Key *key, BIGNUM * challenge,
-    unsigned char session_id[16],
-    unsigned int response_type,
-    unsigned char response[16]);
+    u_char session_id[16],
+    u_int response_type,
+    u_char response[16]);
 
 /* Requests the agent to sign data using key */
 int
 ssh_agent_sign(AuthenticationConnection *auth,
     Key *key,
-    unsigned char **sigp, int *lenp,
-    unsigned char *data, int datalen);
+    u_char **sigp, int *lenp,
+    u_char *data, int datalen);
 
 /*
  * Adds an identity to the authentication server.  This call is not meant to