diff options
| author |   djm <djm@openbsd.org> | 2008-04-30 10:14:03 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2008-04-30 10:14:03 +0000 |
| commit | ca7a0d8690a8022e83ad9c4a8ce47df7edeb3627 (patch) | |
| tree | 58c4c122fa0a61094e5f8e07341fc21d8691a929 | |
| parent | Drop all MPLS packets when MPLS is not enabled. (diff) | |
| download | wireguard-openbsd-ca7a0d8690a8022e83ad9c4a8ce47df7edeb3627.tar.xz wireguard-openbsd-ca7a0d8690a8022e83ad9c4a8ce47df7edeb3627.zip | |
default to rsa (protocol 2) keys, instead of rsa1 keys; spotted by
larsnooden AT openoffice.org
| -rw-r--r-- | usr.bin/ssh/ssh-keyscan.1 | 6 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh-keyscan.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/ssh-keyscan.1 b/usr.bin/ssh/ssh-keyscan.1 index 7273df8c87b..8a4f3bcba3c 100644 --- a/usr.bin/ssh/ssh-keyscan.1 +++ b/usr.bin/ssh/ssh-keyscan.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: ssh-keyscan.1,v 1.23 2007/05/31 19:20:16 jmc Exp $ +.\" $OpenBSD: ssh-keyscan.1,v 1.24 2008/04/30 10:14:03 djm Exp $ .\" .\" Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. .\" @@ -6,7 +6,7 @@ .\" permitted provided that due credit is given to the author and the .\" OpenBSD project by leaving this copyright notice intact. .\" -.Dd $Mdocdate: May 31 2007 $ +.Dd $Mdocdate: April 30 2008 $ .Dt SSH-KEYSCAN 1 .Os .Sh NAME @@ -94,7 +94,7 @@ or for protocol version 2. Multiple values may be specified by separating them with commas. The default is -.Dq rsa1 . +.Dq rsa . .It Fl v Verbose mode. Causes diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c index b3ec7f12d6c..466e3af73cc 100644 --- a/usr.bin/ssh/ssh-keyscan.c +++ b/usr.bin/ssh/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.75 2007/12/27 14:22:08 dtucker Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.76 2008/04/30 10:14:03 djm Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -51,7 +51,7 @@ int ssh_port = SSH_DEFAULT_PORT; #define KT_DSA 2 #define KT_RSA 4 -int get_keytypes = KT_RSA1; /* Get only RSA1 keys by default */ +int get_keytypes = KT_RSA; /* Get only RSA keys by default */ int hash_hosts = 0; /* Hash hostname on output */ |