From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sun, 2 Feb 2014 16:02:02 +0000 (+0000)
Subject: Use more clever time values to setup entropy.
X-Git-Tag: 0.7.0~426
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=611b068491afcc16cce47fe6fedbfcdee5e67ca3;p=thirdparty%2Frspamd.git

Use more clever time values to setup entropy.
---

diff --git a/src/util.c b/src/util.c
index 2afda3546b..3eed9a765b 100644
--- a/src/util.c
+++ b/src/util.c
@@ -2115,6 +2115,11 @@ rspamd_random_bytes (gchar *buf, gsize buflen)
 {
 	gint fd;
 	gsize i;
+#ifdef HAVE_CLOCK_GETTIME
+	struct timespec ts;
+#else
+	struct timeval tv;
+#endif
 #ifdef HAVE_OPENSSL
 
 	/* Init random generator */
@@ -2139,7 +2144,13 @@ fallback:
 		close (fd);
 	}
 	/* No /dev/random */
-	g_random_set_seed (time (NULL));
+#ifdef HAVE_CLOCK_GETTIME
+	(void)clock_gettime (CLOCK_REALTIME, &ts);
+	g_random_set_seed (ts.tv_nsec);
+#else
+	(void)gettimeofday (&tv, NULL);
+	g_random_set_seed (tv.tv_usec);
+#endif
 	for (i = 0; i < buflen; i ++) {
 		buf[i] = g_random_int () & 0xff;
 	}