===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/ssh/authfd.h,v
retrieving revision 1.16.2.3
retrieving revision 1.17
diff -u -r1.16.2.3 -r1.17
--- src/usr.bin/ssh/authfd.h	2002/06/02 22:56:09	1.16.2.3
+++ src/usr.bin/ssh/authfd.h	2001/06/26 04:59:59	1.17
@@ -1,5 +1,3 @@
-/*	$OpenBSD: authfd.h,v 1.16.2.3 2002/06/02 22:56:09 miod Exp $	*/
-
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -13,6 +11,8 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
+/* RCSID("$OpenBSD: authfd.h,v 1.17 2001/06/26 04:59:59 markus Exp $"); */
+
 #ifndef AUTHFD_H
 #define AUTHFD_H
 
@@ -42,39 +42,103 @@
 #define SSH_AGENTC_ADD_SMARTCARD_KEY		20
 #define SSH_AGENTC_REMOVE_SMARTCARD_KEY	        21
 
-/* extended failure messages */
-#define SSH2_AGENT_FAILURE			30
-
 /* additional error code for ssh.com's ssh-agent2 */
-#define SSH_COM_AGENT2_FAILURE                  102
+#define SSH_COM_AGENT2_FAILURE                   102
 
 #define	SSH_AGENT_OLD_SIGNATURE			0x01
 
+
 typedef struct {
 	int     fd;
 	Buffer  identities;
 	int     howmany;
 }       AuthenticationConnection;
 
-int      ssh_get_authentication_socket(void);
-void     ssh_close_authentication_socket(int);
+/* Returns the number of the authentication fd, or -1 if there is none. */
+int     ssh_get_authentication_socket(void);
 
+/*
+ * This should be called for any descriptor returned by
+ * ssh_get_authentication_socket().  Depending on the way the descriptor was
+ * obtained, this may close the descriptor.
+ */
+void    ssh_close_authentication_socket(int authfd);
+
+/*
+ * Opens and connects a private socket for communication with the
+ * authentication agent.  Returns NULL if an error occurred and the
+ * connection could not be opened.  The connection should be closed by the
+ * caller by calling ssh_close_authentication_connection().
+ */
 AuthenticationConnection *ssh_get_authentication_connection(void);
-void     ssh_close_authentication_connection(AuthenticationConnection *);
-int	 ssh_get_num_identities(AuthenticationConnection *, int);
-Key	*ssh_get_first_identity(AuthenticationConnection *, char **, int);
-Key	*ssh_get_next_identity(AuthenticationConnection *, char **, int);
-int	 ssh_add_identity(AuthenticationConnection *, Key *, const char *);
-int	 ssh_remove_identity(AuthenticationConnection *, Key *);
-int	 ssh_remove_all_identities(AuthenticationConnection *, int);
-int	 ssh_update_card(AuthenticationConnection *, int, const char *, const char *);
 
+/*
+ * Closes the connection to the authentication agent and frees any associated
+ * memory.
+ */
+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.
+ * Note that you cannot mix calls with different versions.
+ */
+Key	*ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int version);
+
+/*
+ * Returns the next authentication identity for the agent.  Other functions
+ * can be called between this and ssh_get_first_identity or two calls of this
+ * function.  This returns NULL if there are no more identities.  The caller
+ * must free key and comment after a successful return.
+ */
+Key	*ssh_get_next_identity(AuthenticationConnection *auth, char **comment, int version);
+
+/*
+ * Requests the agent to decrypt the given challenge.  Returns true if the
+ * agent claims it was able to decrypt it.
+ */
 int
-ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16],
-    u_int, u_char[16]);
+ssh_decrypt_challenge(AuthenticationConnection *auth,
+    Key *key, BIGNUM * challenge,
+    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 *, Key *, u_char **, u_int *, u_char *,
-    u_int);
+ssh_agent_sign(AuthenticationConnection *auth,
+    Key *key,
+    u_char **sigp, int *lenp,
+    u_char *data, int datalen);
+
+/*
+ * Adds an identity to the authentication server.  This call is not meant to
+ * be used by normal applications.  This returns true if the identity was
+ * successfully added.
+ */
+int
+ssh_add_identity(AuthenticationConnection *auth, Key *key,
+    const char *comment);
+
+/*
+ * Removes the identity from the authentication server.  This call is not
+ * meant to be used by normal applications.  This returns true if the
+ * identity was successfully added.
+ */
+int     ssh_remove_identity(AuthenticationConnection *auth, Key *key);
+
+/*
+ * Removes all identities from the authentication agent.  This call is not
+ * meant to be used by normal applications.  This returns true if the
+ * operation was successful.
+ */
+int	ssh_remove_all_identities(AuthenticationConnection *auth, int version);
+
+int	ssh_update_card(AuthenticationConnection *auth, int add, int reader_id);
 
 #endif				/* AUTHFD_H */