diff options
| author | des <des@FreeBSD.org> | 2002-06-27 22:31:32 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2002-06-27 22:31:32 +0000 |
| commit | bb02848f18878bddada7a9f55b110116f63c2f3c (patch) | |
| tree | d93e4bc5fc0a9a5e99878bd93a4d51c873c1a43e /crypto/openssh/ssh-keygen.c | |
| parent | 610201f50fdb0594e9885594b69e4ee69c71dd08 (diff) | |
| download | FreeBSD-src-bb02848f18878bddada7a9f55b110116f63c2f3c.zip FreeBSD-src-bb02848f18878bddada7a9f55b110116f63c2f3c.tar.gz | |
Vendor import of OpenSSH 3.3p1.
Diffstat (limited to 'crypto/openssh/ssh-keygen.c')
| -rw-r--r-- | crypto/openssh/ssh-keygen.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/crypto/openssh/ssh-keygen.c b/crypto/openssh/ssh-keygen.c index 66f00cc..df8c90a 100644 --- a/crypto/openssh/ssh-keygen.c +++ b/crypto/openssh/ssh-keygen.c @@ -74,7 +74,11 @@ int print_public = 0; char *key_type_name = NULL; /* argv0 */ +#ifdef HAVE___PROGNAME extern char *__progname; +#else +char *__progname; +#endif char hostname[MAXHOSTNAMELEN]; @@ -753,6 +757,8 @@ main(int ac, char **av) extern int optind; extern char *optarg; + __progname = get_progname(av[0]); + SSLeay_add_all_algorithms(); /* we need this for the home * directory. */ @@ -848,12 +854,10 @@ main(int ac, char **av) do_fingerprint(pw); if (change_passphrase) do_change_passphrase(pw); - if (change_comment) - do_change_comment(pw); if (convert_to_ssh2) do_convert_to_ssh2(pw); - if (convert_from_ssh2) - do_convert_from_ssh2(pw); + if (change_comment) + do_change_comment(pw); if (print_public) do_print_public(pw); if (reader_id != NULL) { @@ -867,8 +871,13 @@ main(int ac, char **av) #endif /* SMARTCARD */ } + init_rng(); + seed_rng(); arc4random_stir(); + if (convert_from_ssh2) + do_convert_from_ssh2(pw); + if (key_type_name == NULL) { printf("You must specify a key type (-t).\n"); usage(); |
