diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-keygen.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20020130 | ||
2 | - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@ | ||
3 | |||
1 | 20020125 | 4 | 20020125 |
2 | - (djm) Don't grab Xserver or pointer by default. x11-ssh-askpass doesn't | 5 | - (djm) Don't grab Xserver or pointer by default. x11-ssh-askpass doesn't |
3 | and grabbing can cause deadlocks with kinput2. | 6 | and grabbing can cause deadlocks with kinput2. |
@@ -7394,4 +7397,4 @@ | |||
7394 | - Wrote replacements for strlcpy and mkdtemp | 7397 | - Wrote replacements for strlcpy and mkdtemp |
7395 | - Released 1.0pre1 | 7398 | - Released 1.0pre1 |
7396 | 7399 | ||
7397 | $Id: ChangeLog,v 1.1796 2002/01/24 13:59:25 djm Exp $ | 7400 | $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) | |||
847 | extern char *optarg; | 847 | extern char *optarg; |
848 | 848 | ||
849 | __progname = get_progname(av[0]); | 849 | __progname = get_progname(av[0]); |
850 | init_rng(); | ||
851 | seed_rng(); | ||
852 | 850 | ||
853 | SSLeay_add_all_algorithms(); | 851 | SSLeay_add_all_algorithms(); |
854 | 852 | ||
@@ -964,6 +962,8 @@ main(int ac, char **av) | |||
964 | #endif /* SMARTCARD */ | 962 | #endif /* SMARTCARD */ |
965 | } | 963 | } |
966 | 964 | ||
965 | init_rng(); | ||
966 | seed_rng(); | ||
967 | arc4random_stir(); | 967 | arc4random_stir(); |
968 | 968 | ||
969 | if (key_type_name == NULL) { | 969 | if (key_type_name == NULL) { |