From 1c7ef4be83f6dec84509a312518b9df00ab491d9 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Sun, 20 Apr 2014 12:59:46 +1000 Subject: [PATCH] - djm@cvs.openbsd.org 2014/03/12 04:44:58 [ssh-keyscan.c] scan for Ed25519 keys by default too --- ChangeLog | 3 +++ ssh-keyscan.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 97c253339..3434ba0eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ ignore enviornment variables with embedded '=' or '\0' characters; spotted by Jann Horn; ok deraadt@ Id sync only - portable already has this. + - djm@cvs.openbsd.org 2014/03/12 04:44:58 + [ssh-keyscan.c] + scan for Ed25519 keys by default too 20140401 - (djm) On platforms that support it, use prctl() to prevent sftp-server diff --git a/ssh-keyscan.c b/ssh-keyscan.c index 8d0a6b8d8..5d77dcfd2 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.89 2013/12/06 13:39:49 markus Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.90 2014/03/12 04:44:58 djm Exp $ */ /* * Copyright 1995, 1996 by David Mazieres . * @@ -58,7 +58,7 @@ int ssh_port = SSH_DEFAULT_PORT; #define KT_ECDSA 8 #define KT_ED25519 16 -int get_keytypes = KT_RSA|KT_ECDSA;/* Get RSA and ECDSA keys by default */ +int get_keytypes = KT_RSA|KT_ECDSA|KT_ED25519; int hash_hosts = 0; /* Hash hostname on output */