summaryrefslogtreecommitdiff
path: root/sshconnect.c
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 /sshconnect.c
parent0fa47cfb32c239117632cab41e4db7d3e6de5e91 (diff)
- djm@cvs.openbsd.org 2013/12/29 05:57:02
[sshconnect.c] when showing other hostkeys, don't forget Ed25519 keys
Diffstat (limited to 'sshconnect.c')
-rw-r--r--sshconnect.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c
index 3cdc46149..b492ce915 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshconnect.c,v 1.241 2013/10/16 02:31:46 djm Exp $ */ 1/* $OpenBSD: sshconnect.c,v 1.242 2013/12/29 05:57:02 djm Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1301,7 +1301,14 @@ ssh_put_password(char *password)
1301static int 1301static int
1302show_other_keys(struct hostkeys *hostkeys, Key *key) 1302show_other_keys(struct hostkeys *hostkeys, Key *key)
1303{ 1303{
1304 int type[] = { KEY_RSA1, KEY_RSA, KEY_DSA, KEY_ECDSA, -1}; 1304 int type[] = {
1305 KEY_RSA1,
1306 KEY_RSA,
1307 KEY_DSA,
1308 KEY_ECDSA,
1309 KEY_ED25519,
1310 -1
1311 };
1305 int i, ret = 0; 1312 int i, ret = 0;
1306 char *fp, *ra; 1313 char *fp, *ra;
1307 const struct hostkey_entry *found; 1314 const struct hostkey_entry *found;