upstream: enable ed25519 support; ok djm

OpenBSD-Commit-ID: 1a399c5b3ef15bd8efb916110cf5a9e0b554ab7e

1 files changed, 5 insertions, 8 deletions

diff --git a/sshconnect2.c b/sshconnect2.c
index 867d463d6..4e5cddf14 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect2.c,v 1.310 2019/10/31 21:23:19 djm Exp $ */
+/* $OpenBSD: sshconnect2.c,v 1.311 2019/11/12 19:33:08 markus Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2008 Damien Miller.  All rights reserved.
@@ -611,7 +611,7 @@ format_identity(Identity *id)
         if (id->key) {
                 if ((id->key->flags & SSHKEY_FLAG_EXT) != 0)
                         note = " token";
-                else if (sshkey_type_plain(id->key->type) == KEY_ECDSA_SK)
+                else if (sshkey_is_sk(id->key))
                         note = " security-key";
         }
         xasprintf(&ret, "%s %s%s%s%s%s%s",
@@ -1468,8 +1468,7 @@ load_identity_file(Identity *id)
                         quit = 1;
                         break;
                 }
-                if (private != NULL &&
-                    sshkey_type_plain(private->type) == KEY_ECDSA_SK &&
+                if (private != NULL && sshkey_is_sk(private) &&
                     options.sk_provider == NULL) {
                         debug("key \"%s\" is a security key, but no "
                             "provider specified", id->filename);
@@ -1554,8 +1553,7 @@ pubkey_prepare(Authctxt *authctxt)
                             options.identity_files[i]);
                         continue;
                 }
-                if (key && sshkey_type_plain(key->type) == KEY_ECDSA_SK &&
-                    options.sk_provider == NULL) {
+                if (key && sshkey_is_sk(key) && options.sk_provider == NULL) {
                         debug("%s: ignoring security key %s as no "
                             "SecurityKeyProvider has been specified",
                             __func__, options.identity_files[i]);
@@ -1579,8 +1577,7 @@ pubkey_prepare(Authctxt *authctxt)
                             options.identity_files[i]);
                         continue;
                 }
-                if (key && sshkey_type_plain(key->type) == KEY_ECDSA_SK &&
-                    options.sk_provider == NULL) {
+                if (key && sshkey_is_sk(key) && options.sk_provider == NULL) {
                         debug("%s: ignoring security key certificate %s as no "
                             "SecurityKeyProvider has been specified",
                             __func__, options.identity_files[i]);