summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2001-12-27 18:10:30 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2001-12-27 18:10:30 +0000
commitfb712980169edaed215ac2c11bb2a86a029f6037 (patch)
tree79ab61400ada27415650e739f8011c5b4f4f65a8 /usr.bin
parent53274e81cb7febe798f109d10d3364058173b63c (diff)
-t is only needed for key generation (unbreaks -i, -e, etc).
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/ssh-keygen.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index 469394479e9..ff67293af14 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -12,7 +12,7 @@
*/
#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/pem.h>
@@ -928,10 +928,6 @@ main(int ac, char **av)
printf("Too many arguments.\n");
usage();
}
- if (key_type_name == NULL) {
- printf("You must specify a key type (-t).\n");
- usage();
- }
if (change_passphrase && change_comment) {
printf("Can only have one of -p and -c.\n");
usage();
@@ -961,6 +957,10 @@ main(int ac, char **av)
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);
if (type == KEY_UNSPEC) {
fprintf(stderr, "unknown key type %s\n", key_type_name);