From 633151a342311b49c6d770d4f632c4db465c733d Mon Sep 17 00:00:00 2001
From: djm <djm>
Date: Mon, 11 Mar 2002 11:53:29 +0000
Subject: [PATCH]  - (djm) ssh-keygen -i needs seeded RNG; report from markus@

---
 ChangeLog    | 1 +
 ssh-keygen.c | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 54471f8a..b64d1082 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
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();
-- 
2.45.1