- djm@cvs.openbsd.org 2008/04/30 10:14:03

     [ssh-keyscan.1 ssh-keyscan.c]
     default to rsa (protocol 2) keys, instead of rsa1 keys; spotted by
     larsnooden AT openoffice.org

3 files changed, 10 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 6d077d7fc..b7e6098e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,10 @@
    - otto@cvs.openbsd.org 2008/04/29 11:20:31
      [monitor_mm.h]
      garbage collect two unused fields in struct mm_master; ok markus@
+   - djm@cvs.openbsd.org 2008/04/30 10:14:03
+     [ssh-keyscan.1 ssh-keyscan.c]
+     default to rsa (protocol 2) keys, instead of rsa1 keys; spotted by
+     larsnooden AT openoffice.org
 
 20080403
  - (djm) [openbsd-compat/bsd-poll.c] Include stdlib.h to avoid compile-
@@ -3899,4 +3903,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4914 2008/05/19 04:55:29 djm Exp $
+$Id: ChangeLog,v 1.4915 2008/05/19 04:56:33 djm Exp $
diff --git a/ssh-keyscan.1 b/ssh-keyscan.1
index 7273df8c8..8a4f3bcba 100644
--- a/ssh-keyscan.1
+++ b/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/ssh-keyscan.c b/ssh-keyscan.c
index 43ebfee55..304fcfde8 100644
--- a/ssh-keyscan.c
+++ b/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>.
  *
@@ -56,7 +56,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 */