diff options
| author | Colin Watson <cjwatson@debian.org> | 2012-09-06 23:20:10 +0100 |
|---|---|---|
| committer | Colin Watson <cjwatson@debian.org> | 2012-09-06 23:20:10 +0100 |
| commit | c6a2c0334e45419875687d250aed9bea78480f2e (patch) | |
| tree | d8f01bef9f3921fa1ca7592a19474be9c8349f76 /ssh-keyscan.c | |
| parent | dd5ed53e20d218607260916a6b04d1c8c5b3d88f (diff) | |
| parent | 8b13b5bdc4f19bd52ee673104d66b71c21153b96 (diff) | |
merge 6.1p1
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 b085dd417..c9de130f4 100644 --- a/ssh-keyscan.c +++ b/ssh-keyscan.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: ssh-keyscan.c,v 1.85 2011/03/15 10:36:02 okan Exp $ */ | 1 | /* $OpenBSD: ssh-keyscan.c,v 1.86 2012/04/11 13:34:17 djm Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. | 3 | * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. |
| 4 | * | 4 | * |
| @@ -57,7 +57,7 @@ int ssh_port = SSH_DEFAULT_PORT; | |||
| 57 | #define KT_RSA 4 | 57 | #define KT_RSA 4 |
| 58 | #define KT_ECDSA 8 | 58 | #define KT_ECDSA 8 |
| 59 | 59 | ||
| 60 | int get_keytypes = KT_RSA; /* Get only RSA keys by default */ | 60 | int get_keytypes = KT_RSA|KT_ECDSA;/* Get RSA and ECDSA keys by default */ |
| 61 | 61 | ||
| 62 | int hash_hosts = 0; /* Hash hostname on output */ | 62 | int hash_hosts = 0; /* Hash hostname on output */ |
| 63 | 63 | ||