diff options
| author | delphij <delphij@FreeBSD.org> | 2012-06-25 18:54:02 +0000 |
|---|---|---|
| committer | delphij <delphij@FreeBSD.org> | 2012-06-25 18:54:02 +0000 |
| commit | cabe4d214f840efeab467937bd586fba19e39dba (patch) | |
| tree | 699b7ba896e27250c6d0ba2dde3dbb849576af6f /ssh-keyscan.c | |
| parent | a9c7316f0b012b7e85d1a1c4d8b6ce36b9fd9604 (diff) | |
| download | FreeBSD-src-cabe4d214f840efeab467937bd586fba19e39dba.zip FreeBSD-src-cabe4d214f840efeab467937bd586fba19e39dba.tar.gz | |
Merge from upstream:
- djm@cvs.openbsd.org 2012/04/11 13:34:17
[ssh-keyscan.1 ssh-keyscan.c]
now that sshd defaults to offering ECDSA keys, ssh-keyscan should also
look for them by default; bz#1971
Approved by: des
Diffstat (limited to 'ssh-keyscan.c')
| -rw-r--r-- | ssh-keyscan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c index b085dd4..c9de130 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.85 2011/03/15 10:36:02 okan Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.86 2012/04/11 13:34:17 djm Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -57,7 +57,7 @@ int ssh_port = SSH_DEFAULT_PORT; #define KT_RSA 4 #define KT_ECDSA 8 -int get_keytypes = KT_RSA; /* Get only RSA keys by default */ +int get_keytypes = KT_RSA|KT_ECDSA;/* Get RSA and ECDSA keys by default */ int hash_hosts = 0; /* Hash hostname on output */ |
