summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ccff55763..b939d6c56 100644
--- 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.
@@ -7394,4 +7397,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1796 2002/01/24 13:59:25 djm Exp $
+$Id: ChangeLog,v 1.1797 2002/01/29 22:37:06 djm Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 49137fbeb..def487eea 100644
--- 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) {