Fix PRNG seeding to resist guessing

[empserver] / src / server / main.c

diff --git a/src/server/main.c b/src/server/main.c
index 6a28d5c9fa7ad1b7314c03dae28147f18d6b6d93..52c4c8cc3fb2eb72494b8cf155e96979aaf9683c 100644 (file)
--- a/src/server/main.c
+++ b/src/server/main.c
@@ -50,6 +50,7 @@
 #include "sys/socket.h"
 #endif
 
+#include "chance.h"
 #include "empio.h"
 #include "empthread.h"
 #include "file.h"
@@ -142,7 +143,8 @@ main(int argc, char **argv)
     char *config_file = NULL;
     int force_bad_state = 0;
     int op, idx, sig;
-    unsigned seed = time(NULL);
+    unsigned seed = 0;
+    int seed_set = 0;
 
     oops_handler = ignore;
 
@@ -193,6 +195,7 @@ main(int argc, char **argv)
            break;
        case 'R':
            seed = strtoul(optarg, NULL, 10);
+           seed_set = 1;
            break;
        case 'v':
            printf("%s\n\n%s", version, legal);
@@ -253,6 +256,8 @@ main(int argc, char **argv)
        return install_service(program_name, service_name, config_file);
 #endif /* _WIN32 */
 
+    if (!seed_set)
+       seed = pick_seed();
     init_server(seed, force_bad_state);
 
 #if defined(_WIN32)
@@ -349,7 +354,7 @@ crash_dump(void)
 static void
 init_server(unsigned seed, int force_bad_state)
 {
-    srandom(seed);
+    seed_prng(seed);
 #if defined(_WIN32)
     loc_NTInit();
 #endif