diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-10-31 21:19:14 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-11-01 09:46:09 +1100 |
commit | b9dd14d3091e31fb836f69873d3aa622eb7b4a1c (patch) | |
tree | 5bfc91dba85b8ab3522431cc123fd0da63f8ed9a /authfd.h | |
parent | 884416bdb10468f1252e4d7c13d51b43dccba7f6 (diff) |
upstream: add new agent key constraint for U2F/FIDO provider
feedback & ok markus@
OpenBSD-Commit-ID: d880c380170704280b4003860a1744d286c7a172
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.46 2019/09/03 08:29:15 djm Exp $ */ | 1 | /* $OpenBSD: authfd.h,v 1.47 2019/10/31 21:19:15 djm Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -30,7 +30,8 @@ int ssh_lock_agent(int sock, int lock, const char *password); | |||
30 | int ssh_fetch_identitylist(int sock, struct ssh_identitylist **idlp); | 30 | int ssh_fetch_identitylist(int sock, struct ssh_identitylist **idlp); |
31 | void ssh_free_identitylist(struct ssh_identitylist *idl); | 31 | void ssh_free_identitylist(struct ssh_identitylist *idl); |
32 | int ssh_add_identity_constrained(int sock, struct sshkey *key, | 32 | int ssh_add_identity_constrained(int sock, struct sshkey *key, |
33 | const char *comment, u_int life, u_int confirm, u_int maxsign); | 33 | const char *comment, u_int life, u_int confirm, u_int maxsign, |
34 | const char *provider); | ||
34 | int ssh_agent_has_key(int sock, struct sshkey *key); | 35 | int ssh_agent_has_key(int sock, struct sshkey *key); |
35 | int ssh_remove_identity(int sock, struct sshkey *key); | 36 | int ssh_remove_identity(int sock, struct sshkey *key); |
36 | int ssh_update_card(int sock, int add, const char *reader_id, | 37 | int ssh_update_card(int sock, int add, const char *reader_id, |
@@ -77,6 +78,7 @@ int ssh_agent_sign(int sock, const struct sshkey *key, | |||
77 | #define SSH_AGENT_CONSTRAIN_LIFETIME 1 | 78 | #define SSH_AGENT_CONSTRAIN_LIFETIME 1 |
78 | #define SSH_AGENT_CONSTRAIN_CONFIRM 2 | 79 | #define SSH_AGENT_CONSTRAIN_CONFIRM 2 |
79 | #define SSH_AGENT_CONSTRAIN_MAXSIGN 3 | 80 | #define SSH_AGENT_CONSTRAIN_MAXSIGN 3 |
81 | #define SSH_AGENT_CONSTRAIN_EXTENSION 255 | ||
80 | 82 | ||
81 | /* extended failure messages */ | 83 | /* extended failure messages */ |
82 | #define SSH2_AGENT_FAILURE 30 | 84 | #define SSH2_AGENT_FAILURE 30 |