diff options
author | naddy@openbsd.org <naddy@openbsd.org> | 2017-05-05 10:42:49 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2017-05-08 09:18:27 +1000 |
commit | 3e371bd2124427403971db853fb2e36ce789b6fd (patch) | |
tree | d05946a4ef052a51cb1c5f867669961e661bbdb0 /authfd.h | |
parent | 2e9c324b3a7f15c092d118c2ac9490939f6228fd (diff) |
upstream commit
more simplification and removal of SSHv1-related code;
ok djm@
Upstream-ID: d2f041aa0b79c0ebd98c68a01e5a0bfab2cf3b55
Diffstat (limited to 'authfd.h')
-rw-r--r-- | authfd.h | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfd.h,v 1.39 2015/12/04 16:41:28 markus Exp $ */ | 1 | /* $OpenBSD: authfd.h,v 1.40 2017/05/05 10:42:49 naddy Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 4 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
@@ -27,8 +27,7 @@ int ssh_get_authentication_socket(int *fdp); | |||
27 | void ssh_close_authentication_socket(int sock); | 27 | void ssh_close_authentication_socket(int sock); |
28 | 28 | ||
29 | int ssh_lock_agent(int sock, int lock, const char *password); | 29 | int ssh_lock_agent(int sock, int lock, const char *password); |
30 | int ssh_fetch_identitylist(int sock, int version, | 30 | int ssh_fetch_identitylist(int sock, struct ssh_identitylist **idlp); |
31 | struct ssh_identitylist **idlp); | ||
32 | void ssh_free_identitylist(struct ssh_identitylist *idl); | 31 | void ssh_free_identitylist(struct ssh_identitylist *idl); |
33 | int ssh_add_identity_constrained(int sock, struct sshkey *key, | 32 | int ssh_add_identity_constrained(int sock, struct sshkey *key, |
34 | const char *comment, u_int life, u_int confirm); | 33 | const char *comment, u_int life, u_int confirm); |