upstream: remove legacy key emulation layer; ok djm@

OpenBSD-Commit-ID: 2b1f9619259e222bbd4fe9a8d3a0973eafb9dd8d

1 files changed, 6 insertions, 7 deletions

diff --git a/sshconnect.c b/sshconnect.c
index afe294660..2eaf020e0 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.299 2018/07/09 21:03:30 markus Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.300 2018/07/11 18:53:29 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -49,14 +49,13 @@
 #endif
 
 #include "xmalloc.h"
-#include "key.h"
 #include "hostfile.h"
 #include "ssh.h"
 #include "sshbuf.h"
 #include "packet.h"
 #include "uidswap.h"
 #include "compat.h"
-#include "key.h"
+#include "sshkey.h"
 #include "sshconnect.h"
 #include "hostfile.h"
 #include "log.h"
@@ -767,7 +766,7 @@ check_host_cert(const char *host, const struct sshkey *host_key)
 {
         const char *reason;
 
-        if (key_cert_check_authority(host_key, 1, 0, host, &reason) != 0) {
+        if (sshkey_cert_check_authority(host_key, 1, 0, host, &reason) != 0) {
                 error("%s", reason);
                 return 0;
         }
@@ -1496,9 +1495,9 @@ show_other_keys(struct hostkeys *hostkeys, struct sshkey *key)
                 logit("WARNING: %s key found for host %s\n"
                     "in %s:%lu\n"
                     "%s key fingerprint %s.",
-                    key_type(found->key),
+                    sshkey_type(found->key),
                     found->host, found->file, found->line,
-                    key_type(found->key), fp);
+                    sshkey_type(found->key), fp);
                 if (options.visual_host_key)
                         logit("%s", ra);
                 free(ra);
@@ -1525,7 +1524,7 @@ warn_changed_key(struct sshkey *host_key)
         error("Someone could be eavesdropping on you right now (man-in-the-middle attack)!");
         error("It is also possible that a host key has just been changed.");
         error("The fingerprint for the %s key sent by the remote host is\n%s.",
-            key_type(host_key), fp);
+            sshkey_type(host_key), fp);
         error("Please contact your system administrator.");
 
         free(fp);