RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2005/10/31 11:12:49 

[ssh-keygen.1 ssh-keygen.c]
     generate a protocol 2 RSA key by default
This commit is contained in:
Damien Miller 2005-11-05 15:15:49 +11:00
parent 653b93be5d
commit f14be5ce03
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -78,6 +78,9 @@
- dtucker@cvs.openbsd.org 2005/10/31 06:15:04 - dtucker@cvs.openbsd.org 2005/10/31 06:15:04
[sftp.c] [sftp.c]
Fix sorting with "ls -1" command. From Robert Tsai, "looks right" deraadt@ 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 20051102
- (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup(). - (dtucker) [openbsd-compat/bsd-misc.c] Bug #1108: fix broken strdup().
@ -3211,4 +3214,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (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 $

5
ssh-keygen.1
View File

@ -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 -*- .\" -*- nroff -*-
.\" .\"
@ -118,6 +118,9 @@ keys for use by SSH protocol version 2.
The type of key to be generated is specified with the The type of key to be generated is specified with the
.Fl t .Fl t
option. option.
If invoked without any arguments,
.Nm
will generate a RSA key for use in SSH protocol 2 connections.
.Pp .Pp
.Nm .Nm
is also used to generate groups for use in Diffie-Hellman group is also used to generate groups for use in Diffie-Hellman group

9
ssh-keygen.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #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/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -1251,10 +1251,9 @@ main(int ac, char **av)
arc4random_stir(); arc4random_stir();
if (key_type_name == NULL) { if (key_type_name == NULL)
printf("You must specify a key type (-t).\n"); key_type_name = "rsa";
usage();
}
type = key_type_from_name(key_type_name); type = key_type_from_name(key_type_name);
if (type == KEY_UNSPEC) { if (type == KEY_UNSPEC) {
fprintf(stderr, "unknown key type %s\n", key_type_name); fprintf(stderr, "unknown key type %s\n", key_type_name);