diff options
| author | Damien Miller <djm@mindrot.org> | 2002-03-11 22:53:29 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2002-03-11 22:53:29 +1100 |
| commit | 4a10d2e90b510dcbb96eb9b86b1122c0c1f72163 (patch) | |
| tree | 9f7a9e39db29b3474af8b66af34c9221e2ffd784 | |
| parent | 581930735aa20f9bcff64f0e22f1ee5d409c18af (diff) | |
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ssh-keygen.c | 9 |
2 files changed, 7 insertions, 5 deletions
@@ -4,6 +4,7 @@ - (djm) Add Markus' patch for compat wih OpenSSL < 0.9.6. Known issue: Blowfish for SSH1 does not work - (stevesk) entropy.c: typo in debug message + - (djm) ssh-keygen -i needs seeded RNG; report from markus@ 20020307 - (djm) OpenBSD CVS Sync @@ -7827,4 +7828,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1919 2002/03/11 00:16:34 stevesk Exp $ +$Id: ChangeLog,v 1.1920 2002/03/11 11:53:29 djm Exp $ diff --git a/ssh-keygen.c b/ssh-keygen.c index 6aff4a44..2de87167 100644 --- a/ssh-keygen.c +++ b/ssh-keygen.c @@ -947,12 +947,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) { @@ -970,6 +968,9 @@ main(int ac, char **av) 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(); |