- (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng().

2 files changed, 11 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index ce1cc2e03..940edc8d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20020720
+ - (stevesk) [ssh-keygen.c] bug #231: always init/seed_rng().
+
 20020719
  - (tim) [contrib/solaris/buildpkg.sh] create privsep user/group if needed.
    Patch by dtucker@zip.com.au
@@ -205,7 +208,7 @@
  - (bal) FreeBSD needs <sys/types.h> to detect if mmap() is supported.
    Bug #303
 
-200206027
+20020627
  - OpenBSD CVS Sync
    - deraadt@cvs.openbsd.org 2002/06/26 14:49:36
      [monitor.c]
@@ -1394,4 +1397,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2379 2002/07/19 19:41:10 tim Exp $
+$Id: ChangeLog,v 1.2380 2002/07/20 19:05:40 stevesk Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 4273c1132..3478e3723 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -761,6 +761,8 @@ main(int ac, char **av)
         __progname = get_progname(av[0]);
 
         SSLeay_add_all_algorithms();
+        init_rng();
+        seed_rng();
 
         /* we need this for the home * directory.  */
         pw = getpwuid(getuid());
@@ -855,10 +857,12 @@ main(int ac, char **av)
                 do_fingerprint(pw);
         if (change_passphrase)
                 do_change_passphrase(pw);
-        if (convert_to_ssh2)
-                do_convert_to_ssh2(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 (print_public)
                 do_print_public(pw);
         if (reader_id != NULL) {
@@ -872,13 +876,8 @@ 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();