summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshconnect.h
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2017-05-30 08:52:19 +0000
committermarkus <markus@openbsd.org>2017-05-30 08:52:19 +0000
commit40a7db51394e5c220188195fac27c1b434b7b809 (patch)
treeb1d34008c5188840d70beee0d472d5746f14104a /usr.bin/ssh/sshconnect.h
parentremove ssh1 references; ok djm@ (diff)
downloadwireguard-openbsd-40a7db51394e5c220188195fac27c1b434b7b809.tar.xz
wireguard-openbsd-40a7db51394e5c220188195fac27c1b434b7b809.zip
switch from Key typedef with struct sshkey; ok djm@
Diffstat (limited to 'usr.bin/ssh/sshconnect.h')
-rw-r--r--usr.bin/ssh/sshconnect.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/usr.bin/ssh/sshconnect.h b/usr.bin/ssh/sshconnect.h
index cf1851a959b..f4e73f7b151 100644
--- a/usr.bin/ssh/sshconnect.h
+++ b/usr.bin/ssh/sshconnect.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.h,v 1.29 2015/11/15 22:26:49 jcs Exp $ */
+/* $OpenBSD: sshconnect.h,v 1.30 2017/05/30 08:52:19 markus Exp $ */
/*
* Copyright (c) 2000 Markus Friedl. All rights reserved.
@@ -26,9 +26,9 @@
typedef struct Sensitive Sensitive;
struct Sensitive {
- Key **keys;
- int nkeys;
- int external_keysign;
+ struct sshkey **keys;
+ int nkeys;
+ int external_keysign;
};
struct addrinfo;
@@ -41,7 +41,7 @@ void ssh_login(Sensitive *, const char *, struct sockaddr *, u_short,
void ssh_exchange_identification(int);
-int verify_host_key(char *, struct sockaddr *, Key *);
+int verify_host_key(char *, struct sockaddr *, struct sshkey *);
void get_hostfile_hostname_ipaddr(char *, struct sockaddr *, u_short,
char **, char **);
@@ -55,7 +55,7 @@ void ssh_userauth2(const char *, const char *, char *, Sensitive *);
void ssh_put_password(char *);
int ssh_local_cmd(const char *);
-void maybe_add_key_to_agent(char *, Key *, char *, char *);
+void maybe_add_key_to_agent(char *, struct sshkey *, char *, char *);
/*
* Macros to raise/lower permissions.