upstream commit

switch from Key typedef with struct sshkey; ok djm@

Upstream-ID: 3067d33e04efbe5131ce8f70668c47a58e5b7a1f

1 files changed, 6 insertions, 6 deletions

diff --git a/sshconnect.h b/sshconnect.h
index cf1851a95..f4e73f7b1 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.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.