diff options
| author |   djm <djm@openbsd.org> | 2001-12-21 08:52:22 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2001-12-21 08:52:22 +0000 |
| commit | 6ff67a4d78781f3523ad0df244a88837273f27dc (patch) | |
| tree | 7430a859d0930036878fccd36c2af2e7a68bfbae /usr.bin/ssh/ssh-keygen.c | |
| parent | MC88410 External Cache Controller inline for MVME197DP/SP (diff) | |
| download | wireguard-openbsd-6ff67a4d78781f3523ad0df244a88837273f27dc.tar.xz wireguard-openbsd-6ff67a4d78781f3523ad0df244a88837273f27dc.zip | |
Remove default (rsa1) key type; ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh-keygen.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keygen.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c index 894070d2d0f..469394479e9 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.86 2001/12/19 07:18:56 deraadt Exp $"); +RCSID("$OpenBSD: ssh-keygen.c,v 1.87 2001/12/21 08:52:22 djm Exp $"); #include <openssl/evp.h> #include <openssl/pem.h> @@ -73,8 +73,7 @@ int convert_to_ssh2 = 0; int convert_from_ssh2 = 0; int print_public = 0; -/* default to RSA for SSH-1 */ -char *key_type_name = "rsa1"; +char *key_type_name = NULL; /* argv0 */ extern char *__progname; @@ -831,7 +830,7 @@ usage(void) int main(int ac, char **av) { - char dotsshdir[16 * 1024], comment[1024], *passphrase1, *passphrase2; + char dotsshdir[MAXPATHLEN], comment[1024], *passphrase1, *passphrase2; char *reader_id = NULL; Key *private, *public; struct passwd *pw; @@ -929,6 +928,10 @@ 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(); |