tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/12/29 05:57:02

Browse Source 
[sshconnect.c]
     when showing other hostkeys, don't forget Ed25519 keys
This commit is contained in:
Damien Miller 2013-12-29 17:54:03 +11:00
parent 0fa47cfb32
commit 106bf1ca3c
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -66,6 +66,9 @@
- djm@cvs.openbsd.org 2013/12/29 05:42:16 - djm@cvs.openbsd.org 2013/12/29 05:42:16
[ssh.c] [ssh.c]
don't forget to load Ed25519 certs too 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 20131221
- (dtucker) [regress/keytype.sh] Actually test ecdsa key types. - (dtucker) [regress/keytype.sh] Actually test ecdsa key types.

11
sshconnect.c
View File

@ -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> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -1301,7 +1301,14 @@ ssh_put_password(char *password)
static int static int
show_other_keys(struct hostkeys *hostkeys, Key *key) 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; int i, ret = 0;
char *fp, *ra; char *fp, *ra;
const struct hostkey_entry *found; const struct hostkey_entry *found;