- (djm) ssh-keygen -i needs seeded RNG; report from markus@

[openssh.git] / ssh-keygen.c

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 6aff4a444aed1318e961d481ff560409381a8307..2de87167e8c85b4854ae44945d8903a758a3c2cf 100644 (file)
--- 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();