New upstream release (7.6p1)

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 @@
-/* $OpenBSD: sshconnect.h,v 1.29 2015/11/15 22:26:49 jcs Exp $ */
+/* $OpenBSD: sshconnect.h,v 1.31 2017/09/12 06:32:07 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -26,14 +26,16 @@
 
 typedef struct Sensitive Sensitive;
 struct Sensitive {
-        Key     **keys;
-        int     nkeys;
-        int     external_keysign;
+        struct sshkey   **keys;
+        int             nkeys;
+        int             external_keysign;
 };
 
 struct addrinfo;
-int      ssh_connect(const char *, struct addrinfo *, struct sockaddr_storage *,
-    u_short, int, int, int *, int, int);
+struct ssh;
+
+int      ssh_connect(struct ssh *, const char *, struct addrinfo *,
+            struct sockaddr_storage *, u_short, int, int, int *, int, int);
 void     ssh_kill_proxy_command(void);
 
 void     ssh_login(Sensitive *, const char *, struct sockaddr *, u_short,
@@ -41,7 +43,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 +57,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.