diff options
author | Damien Miller <djm@mindrot.org> | 2003-06-11 22:06:33 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-06-11 22:06:33 +1000 |
commit | d94f20d28e9e966576302cd951776401c2856df6 (patch) | |
tree | 028352e13c131c8500f0826088cc3c4bb3a3c00a /authfd.h | |
parent | 0e1b937f1362866765c09c11d3f4066f108ff910 (diff) |
- djm@cvs.openbsd.org 2003/06/11 11:18:38
[authfd.c authfd.h ssh-add.c ssh-agent.c]
make agent constraints (lifetime, confirm) work with smartcard keys;
ok markus@
Diffstat (limited to 'authfd.h')
-rw-r--r-- | authfd.h | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfd.h,v 1.32 2003/01/23 13:50:27 markus Exp $ */ | 1 | /* $OpenBSD: authfd.h,v 1.33 2003/06/11 11:18:38 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -49,6 +49,7 @@ | |||
49 | /* add key with constraints */ | 49 | /* add key with constraints */ |
50 | #define SSH_AGENTC_ADD_RSA_ID_CONSTRAINED 24 | 50 | #define SSH_AGENTC_ADD_RSA_ID_CONSTRAINED 24 |
51 | #define SSH2_AGENTC_ADD_ID_CONSTRAINED 25 | 51 | #define SSH2_AGENTC_ADD_ID_CONSTRAINED 25 |
52 | #define SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED 26 | ||
52 | 53 | ||
53 | #define SSH_AGENT_CONSTRAIN_LIFETIME 1 | 54 | #define SSH_AGENT_CONSTRAIN_LIFETIME 1 |
54 | #define SSH_AGENT_CONSTRAIN_CONFIRM 2 | 55 | #define SSH_AGENT_CONSTRAIN_CONFIRM 2 |
@@ -82,7 +83,8 @@ int ssh_add_identity_constrained(AuthenticationConnection *, Key *, | |||
82 | int ssh_remove_identity(AuthenticationConnection *, Key *); | 83 | int ssh_remove_identity(AuthenticationConnection *, Key *); |
83 | int ssh_remove_all_identities(AuthenticationConnection *, int); | 84 | int ssh_remove_all_identities(AuthenticationConnection *, int); |
84 | int ssh_lock_agent(AuthenticationConnection *, int, const char *); | 85 | int ssh_lock_agent(AuthenticationConnection *, int, const char *); |
85 | int ssh_update_card(AuthenticationConnection *, int, const char *, const char *); | 86 | int ssh_update_card(AuthenticationConnection *, int, const char *, |
87 | const char *, u_int, u_int); | ||
86 | 88 | ||
87 | int | 89 | int |
88 | ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16], | 90 | ssh_decrypt_challenge(AuthenticationConnection *, Key *, BIGNUM *, u_char[16], |