random_init() should be called at most once during the running of

[u/mdw/putty] / sshrand.c

diff --git a/sshrand.c b/sshrand.c
index e238666..a7b3dc4 100644 (file)
--- a/sshrand.c
+++ b/sshrand.c
@@ -184,12 +184,14 @@ static void random_add_heavynoise_bitbybit(void *noise, int length)
 
 void random_init(void)
 {
-    memset(&pool, 0, sizeof(pool));    /* just to start with */
+    if (!random_active) {
+       memset(&pool, 0, sizeof(pool));    /* just to start with */
 
-    random_active = 1;
+       random_active = 1;
 
-    noise_get_heavy(random_add_heavynoise_bitbybit);
-    random_stir();
+       noise_get_heavy(random_add_heavynoise_bitbybit);
+       random_stir();
+    }
 }
 
 int random_byte(void)
@@ -202,7 +204,7 @@ int random_byte(void)
 
 void random_get_savedata(void **data, int *len)
 {
-    void *buf = smalloc(POOLSIZE / 2);
+    void *buf = snewn(POOLSIZE / 2, char);
     random_stir();
     memcpy(buf, pool.pool + pool.poolpos, POOLSIZE / 2);
     *len = POOLSIZE / 2;