tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/12/27 18:10:29 

[ssh-keygen.c]
     -t is only needed for key generation (unbreaks -i, -e, etc).
This commit is contained in:
Damien Miller 2002-01-22 23:08:16 +11:00
parent aef7a095c8
commit 154dda73a8
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -32,6 +32,9 @@
- markus@cvs.openbsd.org 2001/12/25 18:53:00 - markus@cvs.openbsd.org 2001/12/25 18:53:00
[auth1.c] [auth1.c]
be more carefull on allocation be more carefull on allocation
- markus@cvs.openbsd.org 2001/12/27 18:10:29
[ssh-keygen.c]
-t is only needed for key generation (unbreaks -i, -e, etc).
20020121 20020121
- (djm) Rework ssh-rand-helper: - (djm) Rework ssh-rand-helper:
@ -7179,4 +7182,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1731 2002/01/22 12:07:52 djm Exp $ $Id: ChangeLog,v 1.1732 2002/01/22 12:08:16 djm Exp $

10
ssh-keygen.c
View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-keygen.c,v 1.87 2001/12/21 08:52:22 djm Exp $"); RCSID("$OpenBSD: ssh-keygen.c,v 1.88 2001/12/27 18:10:29 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -936,10 +936,6 @@ main(int ac, char **av)
printf("Too many arguments.\n"); printf("Too many arguments.\n");
usage(); usage();
} }
if (key_type_name == NULL) {
printf("You must specify a key type (-t).\n");
usage();
}
if (change_passphrase && change_comment) { if (change_passphrase && change_comment) {
printf("Can only have one of -p and -c.\n"); printf("Can only have one of -p and -c.\n");
usage(); usage();
@ -969,6 +965,10 @@ main(int ac, char **av)
arc4random_stir(); arc4random_stir();
if (key_type_name == NULL) {
printf("You must specify a key type (-t).\n");
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);