diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ssh-keygen.1 | 5 | ||||
| -rw-r--r-- | ssh-keygen.c | 9 |
3 files changed, 12 insertions, 7 deletions
@@ -78,6 +78,9 @@ - dtucker@cvs.openbsd.org 2005/10/31 06:15:04 [sftp.c] Fix sorting with "ls -1" command. From Robert Tsai, "looks right" deraadt@ + - djm@cvs.openbsd.org 2005/10/31 11:12:49 + [ssh-keygen.1 ssh-keygen.c] + generate a protocol 2 RSA key by default 20051102 - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). @@ -3211,4 +3214,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.3946 2005/11/05 04:15:23 djm Exp $ +$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 @@ -.\" $OpenBSD: ssh-keygen.1,v 1.69 2005/06/08 03:50:00 djm Exp $ +.\" $OpenBSD: ssh-keygen.1,v 1.70 2005/10/31 11:12:49 djm Exp $ .\" .\" -*- nroff -*- .\" @@ -118,6 +118,9 @@ keys for use by SSH protocol version 2. The type of key to be generated is specified with the .Fl t option. +If invoked without any arguments, +.Nm +will generate a RSA key for use in SSH protocol 2 connections. .Pp .Nm is 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 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keygen.c,v 1.132 2005/10/30 08:52:18 djm Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.133 2005/10/31 11:12:49 djm Exp $"); #include <openssl/evp.h> #include <openssl/pem.h> @@ -1251,10 +1251,9 @@ main(int ac, char **av) arc4random_stir(); - if (key_type_name == NULL) { - printf("You must specify a key type (-t).\n"); - usage(); - } + if (key_type_name == NULL) + key_type_name = "rsa"; + type = key_type_from_name(key_type_name); if (type == KEY_UNSPEC) { fprintf(stderr, "unknown key type %s\n", key_type_name); |