summaryrefslogtreecommitdiff
path: root/sshconnect.h
diff options
context:
space:
mode:
authorColin Watson <cjwatson@debian.org>2017-10-04 11:23:58 +0100
committerColin Watson <cjwatson@debian.org>2017-10-05 23:58:12 +0100
commit0556ea972b15607b7e13ff31bc05840881c91dd3 (patch)
treed6b8d48062d0278b5ae0eeff42d0e9afa9f26860 /sshconnect.h
parentdb2122d97eb1ecdd8d99b7bf79b0dd2b5addfd92 (diff)
parent801a62eedaaf47b20dbf4b426dc3e084bf0c8d49 (diff)
New upstream release (7.6p1)
Diffstat (limited to 'sshconnect.h')
-rw-r--r--sshconnect.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/sshconnect.h b/sshconnect.h
index cf1851a95..b5029e234 100644
--- a/sshconnect.h
+++ b/sshconnect.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.h,v 1.29 2015/11/15 22:26:49 jcs Exp $ */ 1/* $OpenBSD: sshconnect.h,v 1.31 2017/09/12 06:32:07 djm Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 2000 Markus Friedl. All rights reserved. 4 * Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -26,14 +26,16 @@
26 26
27typedef struct Sensitive Sensitive; 27typedef struct Sensitive Sensitive;
28struct Sensitive { 28struct Sensitive {
29 Key **keys; 29 struct sshkey **keys;
30 int nkeys; 30 int nkeys;
31 int external_keysign; 31 int external_keysign;
32}; 32};
33 33
34struct addrinfo; 34struct addrinfo;
35int ssh_connect(const char *, struct addrinfo *, struct sockaddr_storage *, 35struct ssh;
36 u_short, int, int, int *, int, int); 36
37int ssh_connect(struct ssh *, const char *, struct addrinfo *,
38 struct sockaddr_storage *, u_short, int, int, int *, int, int);
37void ssh_kill_proxy_command(void); 39void ssh_kill_proxy_command(void);
38 40
39void ssh_login(Sensitive *, const char *, struct sockaddr *, u_short, 41void ssh_login(Sensitive *, const char *, struct sockaddr *, u_short,
@@ -41,7 +43,7 @@ void ssh_login(Sensitive *, const char *, struct sockaddr *, u_short,
41 43
42void ssh_exchange_identification(int); 44void ssh_exchange_identification(int);
43 45
44int verify_host_key(char *, struct sockaddr *, Key *); 46int verify_host_key(char *, struct sockaddr *, struct sshkey *);
45 47
46void get_hostfile_hostname_ipaddr(char *, struct sockaddr *, u_short, 48void get_hostfile_hostname_ipaddr(char *, struct sockaddr *, u_short,
47 char **, char **); 49 char **, char **);
@@ -55,7 +57,7 @@ void ssh_userauth2(const char *, const char *, char *, Sensitive *);
55void ssh_put_password(char *); 57void ssh_put_password(char *);
56int ssh_local_cmd(const char *); 58int ssh_local_cmd(const char *);
57 59
58void maybe_add_key_to_agent(char *, Key *, char *, char *); 60void maybe_add_key_to_agent(char *, struct sshkey *, char *, char *);
59 61
60/* 62/*
61 * Macros to raise/lower permissions. 63 * Macros to raise/lower permissions.