summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.15
-rw-r--r--ssh-keygen.c9
3 files changed, 12 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index d6c114c74..e16e8c753 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -78,6 +78,9 @@
78 - dtucker@cvs.openbsd.org 2005/10/31 06:15:04 78 - dtucker@cvs.openbsd.org 2005/10/31 06:15:04
79 [sftp.c] 79 [sftp.c]
80 Fix sorting with "ls -1" command. From Robert Tsai, "looks right" deraadt@ 80 Fix sorting with "ls -1" command. From Robert Tsai, "looks right" deraadt@
81 - djm@cvs.openbsd.org 2005/10/31 11:12:49
82 [ssh-keygen.1 ssh-keygen.c]
83 generate a protocol 2 RSA key by default
81 84
8220051102 8520051102
83 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). 86 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
@@ -3211,4 +3214,4 @@
3211 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3214 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3212 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3215 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3213 3216
3214$Id: ChangeLog,v 1.3946 2005/11/05 04:15:23 djm Exp $ 3217$Id: ChangeLog,v 1.3947 2005/11/05 04:15:49 djm Exp $
diff --git a/ssh-keygen.1 b/ssh-keygen.1
index 5454d00ce..2c952ba71 100644
--- a/ssh-keygen.1
+++ b/ssh-keygen.1
@@ -1,4 +1,4 @@
1.\" $OpenBSD: ssh-keygen.1,v 1.69 2005/06/08 03:50:00 djm Exp $ 1.\" $OpenBSD: ssh-keygen.1,v 1.70 2005/10/31 11:12:49 djm Exp $
2.\" 2.\"
3.\" -*- nroff -*- 3.\" -*- nroff -*-
4.\" 4.\"
@@ -118,6 +118,9 @@ keys for use by SSH protocol version 2.
118The type of key to be generated is specified with the 118The type of key to be generated is specified with the
119.Fl t 119.Fl t
120option. 120option.
121If invoked without any arguments,
122.Nm
123will generate a RSA key for use in SSH protocol 2 connections.
121.Pp 124.Pp
122.Nm 125.Nm
123is also used to generate groups for use in Diffie-Hellman group 126is also used to generate groups for use in Diffie-Hellman group
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 915d5580b..7f9c7fd1a 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: ssh-keygen.c,v 1.132 2005/10/30 08:52:18 djm Exp $"); 15RCSID("$OpenBSD: ssh-keygen.c,v 1.133 2005/10/31 11:12:49 djm Exp $");
16 16
17#include <openssl/evp.h> 17#include <openssl/evp.h>
18#include <openssl/pem.h> 18#include <openssl/pem.h>
@@ -1251,10 +1251,9 @@ main(int ac, char **av)
1251 1251
1252 arc4random_stir(); 1252 arc4random_stir();
1253 1253
1254 if (key_type_name == NULL) { 1254 if (key_type_name == NULL)
1255 printf("You must specify a key type (-t).\n"); 1255 key_type_name = "rsa";
1256 usage(); 1256
1257 }
1258 type = key_type_from_name(key_type_name); 1257 type = key_type_from_name(key_type_name);
1259 if (type == KEY_UNSPEC) { 1258 if (type == KEY_UNSPEC) {
1260 fprintf(stderr, "unknown key type %s\n", key_type_name); 1259 fprintf(stderr, "unknown key type %s\n", key_type_name);