- itojun@cvs.openbsd.org 2001/06/26 06:32:58

[openssh.git] / authfd.h

diff --git a/authfd.h b/authfd.h
index 5819b9139eac7935caa9706cd735111cc85760be..4fe35aff8b67f0e9e4007d5c97e071bae1b1accd 100644 (file)
--- a/authfd.h
+++ b/authfd.h
@@ -1,19 +1,17 @@
 /*
- *
- * authfd.h
- *
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
- *
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
  *                    All rights reserved
- *
- * Created: Wed Mar 29 01:17:41 1995 ylo
- *
  * Functions to interface with the SSH_AUTHENTICATION_FD socket.
  *
+ * As far as I am concerned, the code I have written for this software
+ * can be used freely for any purpose.  Any derived versions of this
+ * software must be clearly marked as such, and if the derived work is
+ * incompatible with the protocol description in the RFC file, it must be
+ * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: authfd.h,v 1.10 2000/08/19 21:34:43 markus Exp $"); */
+/* RCSID("$OpenBSD: authfd.h,v 1.18 2001/06/26 06:32:47 itojun Exp $"); */
 
 #ifndef AUTHFD_H
 #define AUTHFD_H
@@ -31,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
@@ -39,6 +38,16 @@
 #define SSH2_AGENTC_REMOVE_IDENTITY            18
 #define SSH2_AGENTC_REMOVE_ALL_IDENTITIES      19
 
+/* smartcard */
+#define SSH_AGENTC_ADD_SMARTCARD_KEY           20
+#define SSH_AGENTC_REMOVE_SMARTCARD_KEY                21
+
+/* additional error code for ssh.com's ssh-agent2 */
+#define SSH_COM_AGENT2_FAILURE                   102
+
+#define        SSH_AGENT_OLD_SIGNATURE                 0x01
+
+
 typedef struct {
        int     fd;
        Buffer  identities;
@@ -46,14 +55,14 @@ 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
  * ssh_get_authentication_socket().  Depending on the way the descriptor was
  * obtained, this may close the descriptor.
  */
-void    ssh_close_authentication_socket(int authfd);
+void    ssh_close_authentication_socket(int);
 
 /*
  * Opens and connects a private socket for communication with the
@@ -61,20 +70,25 @@ 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
  * memory.
  */
-void    ssh_close_authentication_connection(AuthenticationConnection *auth);
+void    ssh_close_authentication_connection(AuthenticationConnection *);
+
+/*
+ * Returns the number authentication identity held by the agent.
+ */
+int    ssh_get_num_identities(AuthenticationConnection *, int);
 
 /*
  * 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);
+Key    *ssh_get_first_identity(AuthenticationConnection *, char **, int);
 
 /*
  * Returns the next authentication identity for the agent.  Other functions
@@ -82,25 +96,20 @@ Key *ssh_get_first_identity(AuthenticationConnection *auth, char **comment, int
  * 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);
+Key    *ssh_get_next_identity(AuthenticationConnection *, char **, int);
 
 /*
  * 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 *auth,
-    Key *key, BIGNUM * challenge,
-    unsigned char session_id[16],
-    unsigned int response_type,
-    unsigned char response[16]);
+ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16],
+    u_int, u_char[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);
+ssh_agent_sign(AuthenticationConnection *, Key *, u_char **, int *,
+    u_char *, int);
 
 /*
  * Adds an identity to the authentication server.  This call is not meant to
@@ -108,21 +117,22 @@ ssh_agent_sign(AuthenticationConnection *auth,
  * successfully added.
  */
 int
-ssh_add_identity(AuthenticationConnection *auth, Key *key,
-    const char *comment);
+ssh_add_identity(AuthenticationConnection *, Key *, const char *);
 
 /*
  * 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);
+int     ssh_remove_identity(AuthenticationConnection *, 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_remove_all_identities(AuthenticationConnection *, int);
+
+int    ssh_update_card(AuthenticationConnection *, int, int);
 
 #endif                         /* AUTHFD_H */