@@ -610,6 +610,7 @@ init_port_share(struct context *c)

 #endif /* if PORT_SHARE */

+

 bool

 init_static(void)

 {

@@ -619,8 +620,20 @@ init_static(void)

     crypto_init_dmalloc();

 #endif

-    init_random_seed();         /* init random() function, only used as

-                                 * source for weak random numbers */

+

+    /*

+     * Initialize random number seed.  random() is only used

+     * when "weak" random numbers are acceptable.

+     * SSL library routines are always used when cryptographically

+     * strong random numbers are required.

+     */

+    struct timeval tv;

+    if (!gettimeofday(&tv, NULL))

+    {

+        const unsigned int seed = (unsigned int) tv.tv_sec ^ tv.tv_usec;

+        srandom(seed);

+    }

+

     error_reset();              /* initialize error.c */

     reset_check_status();       /* initialize status check code in socket.c */

@@ -405,25 +405,6 @@ openvpn_popen(const struct argv *a,  const struct env_set *es)

 /*

- * Initialize random number seed.  random() is only used

- * when "weak" random numbers are acceptable.

- * OpenSSL routines are always used when cryptographically

- * strong random numbers are required.

- */

-

-void

-init_random_seed(void)

-{

-    struct timeval tv;

-

-    if (!gettimeofday(&tv, NULL))

-    {

-        const unsigned int seed = (unsigned int) tv.tv_sec ^ tv.tv_usec;

-        srandom(seed);

-    }

-}

-

-/*

  * Set environmental variable (int or string).

  *

  * On Posix, we use putenv for portability,

@@ -100,9 +100,6 @@ void set_std_files_to_null(bool stdin_only);

 extern int inetd_socket_descriptor;

 void save_inetd_socket_descriptor(void);

-/* init random() function, only used as source for weak random numbers, when !ENABLE_CRYPTO */

-void init_random_seed(void);

-

 /* set/delete environmental variable */

 void setenv_str_ex(struct env_set *es,

                    const char *name,