From: Vsevolod Stakhov <vsevolod@highsecure.ru>
Date: Sat, 7 Feb 2015 16:53:45 +0000 (+0000)
Subject: Init cryptobox library properly.
X-Git-Tag: 0.9.0~749
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e97b0030beff8ab1eb995f5638b689e5c468bb55;p=rspamd.git

Init cryptobox library properly.
---

diff --git a/src/libcryptobox/cryptobox.c b/src/libcryptobox/cryptobox.c
index 49364d096..db6531788 100644
--- a/src/libcryptobox/cryptobox.c
+++ b/src/libcryptobox/cryptobox.c
@@ -87,6 +87,7 @@ rspamd_cryptobox_init (void)
 
 	rspamd_cryptobox_cpuid (cpu, 0);
 	nid = cpu[0];
+	rspamd_cryptobox_cpuid (cpu, 1);
 
 	if (nid > 1) {
 		if ((cpu[3] & ((gint)1 << 26))) {
diff --git a/src/main.c b/src/main.c
index 35bec6f2b..f09ec3270 100644
--- a/src/main.c
+++ b/src/main.c
@@ -35,6 +35,7 @@
 #include "xxhash.h"
 #include "utlist.h"
 #include "libstat/stat_api.h"
+#include "cryptobox.h"
 #ifdef HAVE_OPENSSL
 #include <openssl/rand.h>
 #include <openssl/err.h>
@@ -1139,6 +1140,8 @@ rspamd_init_libs (void)
 	struct rlimit rlim;
 
 	ottery_init (NULL);
+
+	rspamd_cryptobox_init ();
 #ifdef HAVE_SETLOCALE
 	/* Set locale setting to C locale to avoid problems in future */
 	setlocale (LC_ALL, "C");
diff --git a/test/rspamd_http_test.c b/test/rspamd_http_test.c
index 0a22a518c..94a12ee81 100644
--- a/test/rspamd_http_test.c
+++ b/test/rspamd_http_test.c
@@ -167,10 +167,10 @@ rspamd_http_test_func (void)
 	GString *b32_key;
 	double diff, total_diff = 0.0;
 
+	rspamd_cryptobox_init ();
 	rspamd_snprintf (filepath, sizeof (filepath), "/tmp/http-test-XXXXXX");
 	g_assert ((fd = mkstemp (filepath)) != -1);
 
-
 	for (i = 0; i < file_blocks; i ++) {
 		memset (buf, 0, sizeof (buf));
 		g_assert (write (fd, buf, sizeof (buf)) == sizeof (buf));