Allow user to provide random seed to random_init().

diff --git a/src/lib/random.c b/src/lib/random.c
index 39452a99666246ae33ccd96da58eaf62aefe7b97..d4ffa6df216d0b43c56101ea85839020512e4d61 100644 (file)
--- a/src/lib/random.c
+++ b/src/lib/random.c
@@ -1,9 +1,11 @@
 #include "random.h"
+#include <stdbool.h>
 #include <stdint.h>
 
 /* RC4-based pseudo-random state. */
 static uint8_t s[256];
 static uint8_t s_i, s_j;
+static bool inited;
 
 static inline void
 swap_byte (uint8_t *a, uint8_t *b) 
@@ -13,27 +15,26 @@ swap_byte (uint8_t *a, uint8_t *b)
   *b = t;
 }
 
-static uint8_t
-key_byte (int idx) 
-{
-  return idx ^ 0xff;
-}
-
 void
-random_init (void)
+random_init (unsigned seed)
 {
+  uint8_t *seedp = (uint8_t *) &seed;
   int i;
   uint8_t j;
 
+  if (inited)
+    return;
+  
   for (i = 0; i < 256; i++) 
     s[i] = i;
   for (i = j = 0; i < 256; i++) 
     {
-      j += s[i] + key_byte (i);
+      j += s[i] + seedp[i % sizeof seed];
       swap_byte (s + i, s + j);
     }
 
   s_i = s_j = 0;
+  inited = true;
 }
 
 void

diff --git a/src/lib/random.h b/src/lib/random.h
index d2f3706dd07a7c8ccc1e7561b161bf5e13e7c9d1..cc6eed41bf28f0788c0be709bae1d21754c59130 100644 (file)
--- a/src/lib/random.h
+++ b/src/lib/random.h
@@ -3,7 +3,7 @@
 
 #include <stddef.h>
 
-void random_init (void);
+void random_init (unsigned seed);
 void random_bytes (void *, size_t);
 unsigned long random_ulong (void);