Init cryptobox library properly.

diff --git a/src/libcryptobox/cryptobox.c b/src/libcryptobox/cryptobox.c
index 49364d0965be1dbbe0d22642c591c2ff38a38c04..db6531788ebbf87fea75c990cf46c9ea9d9d6173 100644 (file)
--- 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 35bec6f2b699dce6cdd6dbb67dbc4f7665b10f07..f09ec32700218185e49409053833956cb74b2ba9 100644 (file)
--- 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 0a22a518cb8658369ae631ae135bbb778db3dca9..94a12ee817240f0a80b3b2641e8378574964b0b5 100644 (file)
--- 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));