o Merge to OPENSSH_3_6_1P1_GSSAPI_20030408.

[gssapi-openssh.git] / openssh / authfd.h

diff --git a/openssh/authfd.h b/openssh/authfd.h
index 0f2ca7a2ecfff35c9e515bd6324a12c548b8f3e3..2a8751ec18bf503f33db3eff77e0273d392f9c6a 100644 (file)
--- a/openssh/authfd.h
+++ b/openssh/authfd.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: authfd.h,v 1.23 2002/03/04 17:27:39 stevesk Exp $     */
+/*     $OpenBSD: authfd.h,v 1.32 2003/01/23 13:50:27 markus Exp $      */
 
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -40,34 +40,49 @@
 
 /* smartcard */
 #define SSH_AGENTC_ADD_SMARTCARD_KEY           20
-#define SSH_AGENTC_REMOVE_SMARTCARD_KEY                21
+#define SSH_AGENTC_REMOVE_SMARTCARD_KEY                21
+
+/* lock/unlock the agent */
+#define SSH_AGENTC_LOCK                                22
+#define SSH_AGENTC_UNLOCK                      23
+
+/* add key with constraints */
+#define SSH_AGENTC_ADD_RSA_ID_CONSTRAINED      24
+#define SSH2_AGENTC_ADD_ID_CONSTRAINED         25
+
+#define        SSH_AGENT_CONSTRAIN_LIFETIME            1
+#define        SSH_AGENT_CONSTRAIN_CONFIRM             2
 
 /* 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     fd;
+       Buffer  identities;
+       int     howmany;
+}      AuthenticationConnection;
 
-int      ssh_get_authentication_socket(void);
-void     ssh_close_authentication_socket(int);
+int    ssh_agent_present(void);
+int    ssh_get_authentication_socket(void);
+void   ssh_close_authentication_socket(int);
 
 AuthenticationConnection *ssh_get_authentication_connection(void);
-void     ssh_close_authentication_connection(AuthenticationConnection *);
+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_add_identity_constrained(AuthenticationConnection *, Key *,
+    const char *, u_int, u_int);
 int     ssh_remove_identity(AuthenticationConnection *, Key *);
 int     ssh_remove_all_identities(AuthenticationConnection *, int);
-int     ssh_update_card(AuthenticationConnection *, int, const char *);
+int     ssh_lock_agent(AuthenticationConnection *, int, const char *);
+int     ssh_update_card(AuthenticationConnection *, int, const char *, const char *);
 
 int
 ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16],