diff options
| author |   djm <djm@openbsd.org> | 2013-12-29 05:57:02 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2013-12-29 05:57:02 +0000 |
| commit | b550f66cc1fe2be3a96596f54a3aeed60a65331f (patch) | |
| tree | 3624ac2def45a10b5774903f69313e12c444949d /usr.bin/ssh/sshconnect.c | |
| parent | - Verify that the FPU exception flags weren't clobbered as required by C99. (diff) | |
| download | wireguard-openbsd-b550f66cc1fe2be3a96596f54a3aeed60a65331f.tar.xz wireguard-openbsd-b550f66cc1fe2be3a96596f54a3aeed60a65331f.zip | |
when showing other hostkeys, don't forget Ed25519 keys
Diffstat (limited to 'usr.bin/ssh/sshconnect.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index 20db59defc6..6a77b9cafb6 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/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 @@ -1275,7 +1275,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; |