summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2013-12-29 17:54:03 +1100
committerDamien Miller <djm@mindrot.org>2013-12-29 17:54:03 +1100
commit106bf1ca3c7a5fdc34f9fd7a1fe651ca53085bc5 (patch)
tree66da767cd1f33b89dbf0420b87712ec09c79ac8e
parent0fa47cfb32c239117632cab41e4db7d3e6de5e91 (diff)
- djm@cvs.openbsd.org 2013/12/29 05:57:02
[sshconnect.c] when showing other hostkeys, don't forget Ed25519 keys
-rw-r--r--ChangeLog3
-rw-r--r--sshconnect.c11
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 935e9e0a..02d8050a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,6 +66,9 @@
- djm@cvs.openbsd.org 2013/12/29 05:42:16
[ssh.c]
don't forget to load Ed25519 certs too
+ - djm@cvs.openbsd.org 2013/12/29 05:57:02
+ [sshconnect.c]
+ when showing other hostkeys, don't forget Ed25519 keys
20131221
- (dtucker) [regress/keytype.sh] Actually test ecdsa key types.
diff --git a/sshconnect.c b/sshconnect.c
index 3cdc4614..b492ce91 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.241 2013/10/16 02:31:46 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.242 2013/12/29 05:57:02 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1301,7 +1301,14 @@ ssh_put_password(char *password)
static int
show_other_keys(struct hostkeys *hostkeys, Key *key)
{
- int type[] = { KEY_RSA1, KEY_RSA, KEY_DSA, KEY_ECDSA, -1};
+ int type[] = {
+ KEY_RSA1,
+ KEY_RSA,
+ KEY_DSA,
+ KEY_ECDSA,
+ KEY_ED25519,
+ -1
+ };
int i, ret = 0;
char *fp, *ra;
const struct hostkey_entry *found;