- (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@

diff --git a/ChangeLog b/ChangeLog
index 542f49dbcc8a8684b3c8a859920be039327441ce..ca07ca40eed2c1426bf8418b99297fd90b428c96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20020130
+ - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@
+
 20020125
  - (djm) Don't grab Xserver or pointer by default. x11-ssh-askpass doesn't 
    and grabbing can cause deadlocks with kinput2. 

diff --git a/ssh-keygen.c b/ssh-keygen.c
index 49137fbeb51eb589ded03c93a3900b7a83af2276..def487eea820c3f4cbd728c15e68b74ded9b2d9d 100644 (file)
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -847,8 +847,6 @@ main(int ac, char **av)
        extern char *optarg;
 
        __progname = get_progname(av[0]);
-       init_rng();
-       seed_rng();
 
        SSLeay_add_all_algorithms();
 
@@ -964,6 +962,8 @@ main(int ac, char **av)
 #endif /* SMARTCARD */
        }
 
+       init_rng();
+       seed_rng();
        arc4random_stir();
 
        if (key_type_name == NULL) {